Revert "Build coreclr targetGeneric tests separately for CI (#34790)" (#35371)

This reverts commit 9188a5820c.
2025-06-10 18:11:04 +09:00 · 2020-04-23 19:15:05 -04:00 · 2020-04-23 19:15:05 -04:00 · cce6883ec1
commit cce6883ec1
parent f781875451
23 changed files with 20 additions and 232 deletions
--- 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()
--- 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)'
--- a/eng/pipelines/coreclr/ci.yml
+++ b/eng/pipelines/coreclr/ci.yml
@ -92,16 +92,6 @@ jobs:
 #
 # Checked test builds
 #
- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    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
@ -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
--- 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)'

--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@ -385,25 +385,6 @@ jobs:
    jobParameters:
      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
 #
@ -595,20 +576,6 @@ jobs:
 # CoreCLR Test builds using live libraries release build
 # Only when CoreCLR is changed
 #
- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    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
@ -621,7 +588,6 @@ jobs:
    jobParameters:
      testGroup: innerloop
      liveLibrariesBuildConfig: Release
-      testBuildPhase: targetSpecific
      condition: >-
        or(
          eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true),
@ -631,21 +597,6 @@ jobs:
 # CoreCLR Test builds using live libraries debug build
 # Only when CoreCLR is changed
 #
- template: /eng/pipelines/common/platform-matrix.yml
-  parameters:
-    jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
-    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
@ -658,7 +609,6 @@ jobs:
    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),
--- a/src/coreclr/tests/src/Interop/COM/Activator/Activator.csproj
+++ b/src/coreclr/tests/src/Interop/COM/Activator/Activator.csproj
@ -32,10 +32,4 @@
    </ItemGroup>
    <Move SourceFiles="@(ServerAssembly)" DestinationFolder="$(ServerAssemblyDest)" />
  </Target>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="AssemblyC.csproj" />
    <ProjectReference Include="AssemblyContracts.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="AssemblyC.csproj" />
    <ProjectReference Include="AssemblyContracts.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
  <ItemGroup>
    <Compile Include="AssemblyC.cs" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
  <ItemGroup>
    <Compile Include="AssemblyContracts.cs" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
  <ItemGroup>
    <ProjectReference Include="../MockReferenceTrackerRuntime/CMakeLists.txt" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- a/src/coreclr/tests/src/Interop/COM/Dynamic/Dynamic.csproj
+++ b/src/coreclr/tests/src/Interop/COM/Dynamic/Dynamic.csproj
@ -22,10 +22,4 @@
    <ProjectReference Include="Server/CMakeLists.txt" />
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
    <ProjectReference Include="NetClientPrimitives.csproj" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- 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 @@
  <ItemGroup>
    <Compile Include="NETServer.DefaultInterfaces.il" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- a/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETServer/NETServer.csproj
@ -8,10 +8,4 @@
    <Compile Include="../ServerContracts/Server.Contracts.cs" />
    <Compile Include="../ServerContracts/ServerGuids.cs" />
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>
--- a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
+++ b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
@ -12,10 +12,4 @@
      <Name>NETServer</Name>
    </ProjectReference>
  </ItemGroup>
-  <PropertyGroup>
-    <CLRTestNeedTarget>1</CLRTestNeedTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <TraitTags Include="OsSpecific" />
-  </ItemGroup>
 </Project>