Don't pass down netcoreapp in yml builds

52d67af0 · Santiago Fernandez Madero · 6b101e01 · 52d67af0 · 52d67af0 · 52d67af0
13 changed file
--- a/eng/pipelines/coreclr/templates/build-test-job.yml
+++ b/eng/pipelines/coreclr/templates/build-test-job.yml
@@ -67,7 +67,7 @@ jobs:
      dependsOn:
      - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
      - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
-        - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
+        - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}


    ${{ if eq(parameters.testGroup, 'innerloop') }}:

--- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
+++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
@@ -70,7 +70,7 @@ jobs:
    dependsOn:
    - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
    - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
-      - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
+      - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}

    # Run all steps in the container.
    # Note that the containers are defined in platform-matrix.yml

--- a/eng/pipelines/coreclr/templates/perf-job.yml
+++ b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -30,7 +30,7 @@ jobs:
    dependsOn:
    - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
    - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
-      - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
+      - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}

    ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
      extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }}

--- a/eng/pipelines/coreclr/templates/run-test-job.yml
+++ b/eng/pipelines/coreclr/templates/run-test-job.yml
@@ -58,7 +58,7 @@ jobs:
    - ${{ if ne(parameters.stagedBuild, true) }}:
      - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
      - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
-        - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
+        - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}

    # Compute job name from template parameters
    ${{ if eq(parameters.testGroup, 'innerloop') }}:

--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -314,7 +314,7 @@ jobs:
        parameters.archType,
        parameters.liveCoreClrBuildConfig) }}
  - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
-    - libraries_build_netcoreapp_${{ format('{0}{1}_{2}_{3}',
+    - libraries_build_${{ format('{0}{1}_{2}_{3}',
        parameters.osGroup,
        parameters.osSubgroup,
        parameters.archType,
@@ -324,7 +324,7 @@ jobs:
  - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
    - ${{ each platform in parameters.platforms }}:
      - coreclr_product_build_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }}
-      - libraries_build_netcoreapp_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
+      - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}

  steps:


--- a/eng/pipelines/libraries/base-job.yml
+++ b/eng/pipelines/libraries/base-job.yml
@@ -21,11 +21,12 @@ parameters:
 jobs:
  - template: /eng/common/templates/job/job.yml
    parameters:
-      name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      ${{ if eq(parameters.framework, 'netcoreapp') }}:
+      ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
        displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      ${{ if ne(parameters.framework, 'netcoreapp') }}:
+        name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
        displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
+        name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

      enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
      container: ${{ parameters.container }}

--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -3,7 +3,7 @@ parameters:
  osGroup: ''
  osSubgroup: ''
  archType: ''
-  framework: netcoreapp
+  framework: ''
  isOfficialBuild: false
  isOfficialAllConfigurations: false

@@ -126,8 +126,8 @@ jobs:
          - task: CopyFiles@2
            displayName: Prepare shared framework runtime folder to publish
            inputs:
-              sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime # The hardcoded target framework should be removed when we drop the support for versionless targetframeworks from ci.
-              targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime
+              sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg
+              targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg

          - task: CopyFiles@2
            displayName: Prepare docs folder to publish

--- a/eng/pipelines/libraries/build-test-job.yml
+++ b/eng/pipelines/libraries/build-test-job.yml
@@ -3,7 +3,7 @@ parameters:
  osGroup: ''
  osSubgroup: ''
  archType: ''
-  framework: netcoreapp
+  framework: ''
  isOfficialBuild: false
  liveCoreClrBuildConfig: ''
  timeoutInMinutes: 150
@@ -34,7 +34,10 @@ jobs:
      displayName: 'Test Build'

      dependsOn:
-      - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
+        - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
+        - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}

      variables:
        - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.buildConfig) }}

--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -75,7 +75,7 @@ jobs:
    # Windows_NT x64
    - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:
      # netcoreapp
-      - ${{ if eq(parameters.jobParameters.framework, 'netcoreapp') }}:
+      - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
        - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
          - Windows.7.Amd64.Open
          - Windows.81.Amd64.Open
@@ -99,7 +99,7 @@ jobs:
    # Windows_NT x86
    - ${{ if eq(parameters.platform, 'Windows_NT_x86') }}:
      # netcoreapp
-      - ${{ if eq(parameters.jobParameters.framework, 'netcoreapp') }}:
+      - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
        - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
          - Windows.7.Amd64.Open
          - Windows.81.Amd64.Open

--- a/eng/pipelines/libraries/outerloop.yml
+++ b/eng/pipelines/libraries/outerloop.yml
@@ -61,7 +61,6 @@ jobs:
      jobParameters:
        isOfficialBuild: ${{ variables['isOfficialBuild'] }}
        isFullMatrix: ${{ variables['isFullMatrix'] }}
-        framework: netcoreapp
        runTests: true
        testScope: outerloop
        liveCoreClrBuildConfig: release
@@ -83,7 +82,6 @@ jobs:
        jobParameters:
          isOfficialBuild: ${{ variables['isOfficialBuild'] }}
          isFullMatrix: ${{ variables['isFullMatrix'] }}
-          framework: netcoreapp
          runTests: true
          testScope: outerloop
          liveCoreClrBuildConfig: release

--- a/eng/pipelines/libraries/run-test-job.yml
+++ b/eng/pipelines/libraries/run-test-job.yml
@@ -3,7 +3,7 @@ parameters:
  osGroup: ''
  osSubgroup: ''
  archType: ''
-  framework: netcoreapp
+  framework: ''
  isOfficialBuild: false
  liveCoreClrBuildConfig: ''
  timeoutInMinutes: 150
@@ -37,8 +37,12 @@ jobs:
        name: test_run

      dependsOn:
-      - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      - ${{ format('libraries_test_build_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
+      - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
+        - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+        - ${{ format('libraries_test_build_{0}_{1}_{2}', parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
+      - ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
+        - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+        - ${{ format('libraries_test_build_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
      - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
        - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveCoreClrBuildConfig) }}


--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -218,7 +218,6 @@ jobs:
    - ${{ if eq(variables['isFullMatrix'], false) }}:
      - Windows_NT_x86
    jobParameters:
-      framework: netcoreapp
      liveCoreClrBuildConfig: release
      condition: >-
        or(
@@ -430,7 +429,6 @@ jobs:
    jobParameters:
      isOfficialBuild: false
      isFullMatrix: ${{ variables.isFullMatrix }}
-      framework: netcoreapp
      testScope: innerloop
      liveCoreClrBuildConfig: release
      dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@@ -463,7 +461,6 @@ jobs:
    jobParameters:
      isOfficialBuild: false
      isFullMatrix: ${{ variables.isFullMatrix }}
-      framework: netcoreapp
      testScope: innerloop
      liveCoreClrBuildConfig: release
      dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@@ -489,7 +486,6 @@ jobs:
    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
    helixQueueGroup: libraries
    jobParameters:
-      framework: netcoreapp
      testScope: innerloop
      liveCoreClrBuildConfig: checked
      dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@@ -510,7 +506,6 @@ jobs:
    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
    helixQueueGroup: libraries
    jobParameters:
-      framework: netcoreapp
      testScope: innerloop
      liveCoreClrBuildConfig: checked
      dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@@ -533,7 +528,6 @@ jobs:
    helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
    helixQueueGroup: libraries
    jobParameters:
-      framework: netcoreapp
      testScope: innerloop
      liveCoreClrBuildConfig: checked
      dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}

--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -57,10 +57,6 @@
    <!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set -->
    <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">$(TargetGroup)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>

-    <!-- This is in order for yml files to not need to be updated every new release and so that we can pass down versionless 
-          netcoreapp framework which its update is driven by NetCoreAppCurrent -->
-    <BuildConfiguration Condition="'$(TargetGroup)' == 'netcoreapp'">$(NetCoreAppCurrent)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
-
    <!-- if PKGPROJ doesn't set BuildConfigurations, make sure it only builds for TargetGroup=package or BuildAllConfigurations -->
    <BuildConfigurations Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(BuildConfigurations)' == ''">package</BuildConfigurations>
  </PropertyGroup>
@@ -271,8 +267,6 @@
    <!-- Paths to binplace package content -->
    <NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath>
    <NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath>
-    <NetFxPackageRefPath>$(ArtifactsBinDir)pkg\$(NetFrameworkCurrent)\ref</NetFxPackageRefPath>
-    <NetFxPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetFrameworkCurrent)\lib</NetFxPackageRuntimePath>

    <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>