From cce6883ec18e81de4f97070cbfb13b628078a351 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Thu, 23 Apr 2020 19:15:05 -0400 Subject: [PATCH] Revert "Build coreclr targetGeneric tests separately for CI (#34790)" (#35371) This reverts commit 9188a5820ccc6dffc5763d22ee4a6cd040a4048c. --- .../common/templates/runtimes/build-test-job.yml | 63 +++++++--------------- .../common/templates/runtimes/run-test-job.yml | 13 ----- eng/pipelines/coreclr/ci.yml | 13 ----- .../coreclr/templates/xplat-pipeline-job.yml | 3 -- eng/pipelines/runtime.yml | 52 ------------------ .../src/Interop/COM/Activator/Activator.csproj | 6 --- .../Interop/COM/Activator/Servers/AssemblyA.csproj | 6 --- .../Interop/COM/Activator/Servers/AssemblyB.csproj | 6 --- .../Interop/COM/Activator/Servers/AssemblyC.csproj | 6 --- .../COM/Activator/Servers/AssemblyContracts.csproj | 6 --- .../COM/ComWrappers/API/ComWrappersTests.csproj | 6 --- .../GlobalInstance/GlobalInstanceTests.csproj | 6 --- .../tests/src/Interop/COM/Dynamic/Dynamic.csproj | 6 --- .../Aggregation/NETClientAggregation.csproj | 6 --- .../ConsumeNETServer/ConsumeNETServer.csproj | 6 --- .../COM/NETClients/Events/NETClientEvents.csproj | 6 --- .../NETClients/IDispatch/NETClientIDispatch.csproj | 6 --- .../NETClients/Licensing/NETClientLicense.csproj | 6 --- .../Primitives/NETClientPrimitives.csproj | 6 --- .../Primitives/NETClientPrimitivesInALC.csproj | 6 --- .../NETServer/NETServer.DefaultInterfaces.ilproj | 6 --- .../src/Interop/COM/NETServer/NETServer.csproj | 6 --- .../src/Interop/COM/Reflection/Reflection.csproj | 6 --- 23 files changed, 20 insertions(+), 232 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 20f55bb..00a072e 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -6,7 +6,6 @@ parameters: container: '' testGroup: '' liveRuntimeBuildConfig: '' - testBuildPhase: '' # When set to a non-empty value (Debug / Release), it determines libraries # build configuration to use for the tests. Setting this property implies @@ -51,24 +50,13 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: continueOnError: true - # Compute job name from template parameters ${{ if eq(parameters.testGroup, 'innerloop') }}: - ${{ if ne(parameters.testBuildPhase, 'targetGeneric') }}: - name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' - ${{ if ne(parameters.testGroup, 'innerloop') }}: - ${{ if ne(parameters.testBuildPhase, 'targetGeneric') }}: - name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' - ${{ if eq(parameters.testGroup, 'innerloop') }}: - ${{ if eq(parameters.testBuildPhase, 'targetGeneric') }}: - name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_AnyOS_AnyCPU_${{ parameters.buildConfig }}_Lib${{ parameters.liveLibrariesBuildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri0 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }} Libraries:${{ parameters.liveLibrariesBuildConfig }}' ${{ if ne(parameters.testGroup, 'innerloop') }}: - ${{ if eq(parameters.testBuildPhase, 'targetGeneric') }}: - name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{ parameters.buildConfig }}_Lib${{ parameters.liveLibrariesBuildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri1 Test Build AnyOS AnyCPU ${{ parameters.buildConfig }} Libraries:${{ parameters.liveLibrariesBuildConfig }}' + name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' # Since the condition is being altered, merge the default with the additional conditions. # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions @@ -132,7 +120,7 @@ jobs: # Build managed test components - - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.testBuildPhase }} skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) + - script: $(coreClrRepoRootDir)build-test$(scriptExt) skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) displayName: Build managed test components @@ -141,32 +129,24 @@ jobs: parameters: rootFolder: $(managedTestArtifactRootFolderPath) includeRootFolder: false - ${{ if ne(parameters.testBuildPhase, 'targetGeneric') }}: - archiveExtension: $(archiveExtension) - archiveType: $(archiveType) - tarCompression: $(tarCompression) - artifactName: $(managedTestArtifactName) - displayName: 'managed test components' - ${{ if eq(parameters.testBuildPhase, 'targetGeneric') }}: - archiveExtension: '.tar.gz' - archiveType: tar - tarCompression: gz - artifactName: $(managedGenericTestArtifactName) - displayName: 'managed test components (generic)' + archiveType: $(archiveType) + tarCompression: $(tarCompression) + archiveExtension: $(archiveExtension) + artifactName: $(managedTestArtifactName) + displayName: 'managed test components' # Publish .packages/microsoft.net.sdk.il needed for traversing # test projects during the copynativeonly command in run test job. - - ${{ if ne(parameters.testBuildPhase, 'targetGeneric') }}: - - template: /eng/pipelines/common/upload-artifact-step.yml - parameters: - rootFolder: $(microsoftNetSdkIlFolderPath) - includeRootFolder: false - archiveType: $(archiveType) - tarCompression: $(tarCompression) - archiveExtension: $(archiveExtension) - artifactName: $(microsoftNetSdkIlArtifactName) - displayName: 'Microsoft.NET.Sdk.IL package' + - template: /eng/pipelines/common/upload-artifact-step.yml + parameters: + rootFolder: $(microsoftNetSdkIlFolderPath) + includeRootFolder: false + archiveType: $(archiveType) + tarCompression: $(tarCompression) + archiveExtension: $(archiveExtension) + artifactName: $(microsoftNetSdkIlArtifactName) + displayName: 'Microsoft.NET.Sdk.IL package' # Publish Logs @@ -174,9 +154,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - ${{ if ne(parameters.testBuildPhase, 'targetGeneric') }}: - artifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' - ${{ if eq(parameters.testBuildPhase, 'targetGeneric') }}: - artifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_AnyOS_AnyCPU_$(buildConfig)_Lib${{ parameters.liveLibrariesBuildConfig }}_${{ parameters.testGroup }}' + artifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 3da5b9c..ba72a9a 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -22,7 +22,6 @@ parameters: variables: {} pool: '' runtimeFlavorDisplayName: 'CoreCLR' - testBuildPhased : false ### Test run job @@ -58,11 +57,6 @@ jobs: - '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.testGroup, 'innerloop') }}: - '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - - ${{ if eq(parameters.testBuildPhased, true) }}: - - ${{ if eq(parameters.testGroup, 'innerloop') }}: - - '${{ parameters.runtimeFlavor }}_common_test_build_p0_AnyOS_AnyCPU_${{parameters.buildConfig }}_Lib${{ parameters.liveLibrariesBuildConfig }}' - - ${{ if ne(parameters.testGroup, 'innerloop') }}: - - '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{parameters.buildConfig }}_Lib${{ parameters.liveLibrariesBuildConfig }}' - ${{ if ne(parameters.stagedBuild, true) }}: - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: @@ -195,13 +189,6 @@ jobs: # Download and unzip managed test artifacts - ${{ if ne(parameters.corefxTests, true) }}: - - ${{ if eq(parameters.testBuildPhased, true) }}: - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: '$(managedTestArtifactRootFolderPath)' - artifactFileName: '$(managedGenericTestArtifactName).tar.gz' - artifactName: '$(managedGenericTestArtifactName)' - displayName: 'generic managed test artifacts' - template: /eng/pipelines/common/download-artifact-step.yml parameters: unpackFolder: '$(managedTestArtifactRootFolderPath)' diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index dd12c74..4982ffd 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -97,16 +97,6 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 - testGroup: outerloop - jobParameters: - liveLibrariesBuildConfig: Release - testBuildPhase: targetGeneric -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: checked - platforms: - Linux_arm - Linux_arm64 - OSX_x64 @@ -117,7 +107,6 @@ jobs: testGroup: outerloop jobParameters: liveLibrariesBuildConfig: Release - testBuildPhase: targetSpecific # # Checked JIT test runs @@ -132,7 +121,6 @@ jobs: jobParameters: testGroup: outerloop liveLibrariesBuildConfig: Release - testBuildPhased: true # # Checked R2R test runs @@ -158,7 +146,6 @@ jobs: readyToRun: true displayNameArgs: R2R liveLibrariesBuildConfig: Release - testBuildPhased: true # # Crossgen-comparison jobs diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 3a693c2..c9f71a9 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -78,9 +78,6 @@ jobs: - name: corelibProductArtifactName value: 'CoreLib_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - - name: managedGenericTestArtifactName - value: 'CoreCLRManagedTestArtifacts_AnyOS_AnyCPU_$(buildConfig)_Lib${{ parameters.liveLibrariesBuildConfig }}' - - name: managedTestArtifactName value: 'CoreCLRManagedTestArtifacts_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index dd800f4..faa4185 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -386,25 +386,6 @@ jobs: liveRuntimeBuildConfig: release # -# Build libraries using live CoreLib -# These are part of the test coreclr generic test build. -# -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/libraries/build-job.yml - buildConfig: Release - platforms: - - OSX_x64 - jobParameters: - liveRuntimeBuildConfig: release - condition: >- - and( - ne(variables['debugOnPrReleaseOnRolling'], 'Release'), - or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(variables['isFullMatrix'], true))) - -# # Build libraries using Mono CoreLib only # - template: /eng/pipelines/common/platform-matrix.yml @@ -600,20 +581,6 @@ jobs: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - OSX_x64 - jobParameters: - testGroup: innerloop - liveLibrariesBuildConfig: Release - testBuildPhase: targetGeneric - condition: >- - or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(variables['isFullMatrix'], true)) -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: checked - platforms: - Linux_arm - Windows_NT_x86 - Windows_NT_arm @@ -621,7 +588,6 @@ jobs: jobParameters: testGroup: innerloop liveLibrariesBuildConfig: Release - testBuildPhase: targetSpecific condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -637,28 +603,12 @@ jobs: buildConfig: checked platforms: - OSX_x64 - jobParameters: - testGroup: innerloop - liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - testBuildPhase: targetGeneric - condition: >- - and(ne(variables['debugOnPrReleaseOnRolling'], 'Release'), - or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(variables['isFullMatrix'], true))) -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: checked - platforms: - - OSX_x64 - Linux_x64 - Linux_arm64 - Windows_NT_x64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - testBuildPhase: targetSpecific condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -682,7 +632,6 @@ jobs: jobParameters: testGroup: innerloop liveLibrariesBuildConfig: Release - testBuildPhased: true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -702,7 +651,6 @@ jobs: jobParameters: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - testBuildPhased: true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), diff --git a/src/coreclr/tests/src/Interop/COM/Activator/Activator.csproj b/src/coreclr/tests/src/Interop/COM/Activator/Activator.csproj index f68f177..a2c1c59 100644 --- a/src/coreclr/tests/src/Interop/COM/Activator/Activator.csproj +++ b/src/coreclr/tests/src/Interop/COM/Activator/Activator.csproj @@ -32,10 +32,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyA.csproj b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyA.csproj index 25cd7bc..0450b41 100644 --- a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyA.csproj +++ b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyA.csproj @@ -11,10 +11,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyB.csproj b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyB.csproj index 7736ea6..d8ebd98 100644 --- a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyB.csproj +++ b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyB.csproj @@ -10,10 +10,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyC.csproj b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyC.csproj index fb60b27..1a76fc4 100644 --- a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyC.csproj +++ b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyC.csproj @@ -6,10 +6,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyContracts.csproj b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyContracts.csproj index 67b20eb..d3f3b4f 100644 --- a/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyContracts.csproj +++ b/src/coreclr/tests/src/Interop/COM/Activator/Servers/AssemblyContracts.csproj @@ -6,10 +6,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/ComWrappers/API/ComWrappersTests.csproj b/src/coreclr/tests/src/Interop/COM/ComWrappers/API/ComWrappersTests.csproj index 37f14d7..83acfa1 100644 --- a/src/coreclr/tests/src/Interop/COM/ComWrappers/API/ComWrappersTests.csproj +++ b/src/coreclr/tests/src/Interop/COM/ComWrappers/API/ComWrappersTests.csproj @@ -14,10 +14,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/ComWrappers/GlobalInstance/GlobalInstanceTests.csproj b/src/coreclr/tests/src/Interop/COM/ComWrappers/GlobalInstance/GlobalInstanceTests.csproj index 205811d..1e5e14f 100644 --- a/src/coreclr/tests/src/Interop/COM/ComWrappers/GlobalInstance/GlobalInstanceTests.csproj +++ b/src/coreclr/tests/src/Interop/COM/ComWrappers/GlobalInstance/GlobalInstanceTests.csproj @@ -34,10 +34,4 @@ PreserveNewest - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/Dynamic/Dynamic.csproj b/src/coreclr/tests/src/Interop/COM/Dynamic/Dynamic.csproj index 324266b..f44514c 100644 --- a/src/coreclr/tests/src/Interop/COM/Dynamic/Dynamic.csproj +++ b/src/coreclr/tests/src/Interop/COM/Dynamic/Dynamic.csproj @@ -22,10 +22,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj index e29fe4b..5c358c4 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj @@ -20,10 +20,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj index 89f42a8..5c1447e 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj @@ -31,10 +31,4 @@ PreserveNewest - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj index bbd6884..b10cf70 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj @@ -21,10 +21,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj index e29fe4b..5c358c4 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj @@ -20,10 +20,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj index e29fe4b..5c358c4 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj @@ -20,10 +20,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj index 8752ff0..f876bed 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj @@ -25,10 +25,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj index 56b5613..5279d5f 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj @@ -18,10 +18,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.DefaultInterfaces.ilproj b/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.DefaultInterfaces.ilproj index a60092b..f1af2b9 100644 --- a/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.DefaultInterfaces.ilproj +++ b/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.DefaultInterfaces.ilproj @@ -5,10 +5,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.csproj b/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.csproj index 72b1b2f..ebaacfc 100644 --- a/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.csproj @@ -8,10 +8,4 @@ - - 1 - - - - diff --git a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj index 186dcf0..157be61 100644 --- a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj +++ b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj @@ -12,10 +12,4 @@ NETServer - - 1 - - - - -- 2.7.4