Merge remote-tracking branch 'dotnet/master' into RemoveNetcoreappNetfxBuildScripts

diff --cc docs/project/library-servicing.md
Simple merge

diff --cc docs/workflow/building/libraries/README.md
Simple merge

diff --cc eng/build.ps1
index acd322f,3c3f6e7..38de331
--- 1/eng/build.ps1
--- 2/eng/build.ps1
+++ b/eng/build.ps1
@@@ -118,16 -132,18 +132,17 @@@ foreach ($argument in $PSBoundParameter
  {
    switch($argument)
    {
-     "build"             { $arguments += " -build" }
-     "buildtests"        { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } }
-     "test"              { $arguments += " -test" }
-     "configuration"     { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" }
-     "framework"         { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())" }
-     "os"                { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
-     "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" }
-     "arch"              { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }
-     "properties"        { $arguments += " " + $properties }
-     default             { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" }
+     "build"                { $arguments += " -build" }
+     "buildtests"           { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } }
+     "test"                 { $arguments += " -test" }
+     "configuration"        { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" }
+     "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" }
 -    # This should be removed after we have finalized our ci build pipeline.
 -    "framework"            { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}}
++    "framework"            { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())" }
+     "os"                   { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
+     "allconfigurations"    { $arguments += " /p:BuildAllConfigurations=true" }
+     "arch"                 { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }
+     "properties"           { $arguments += " " + $properties }
+     default                { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" }
    }
  }
  

diff --cc eng/build.sh
Simple merge

diff --cc eng/pipelines/installer/jobs/base-job.yml
index 15af3c3,385762a..262163a
--- 1/eng/pipelines/installer/jobs/base-job.yml
--- 2/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@@ -312,9 -314,9 +314,9 @@@ jobs
          parameters.osGroup,
          parameters.osSubgroup,
          parameters.archType,
-         parameters.liveCoreClrBuildConfig) }}
+         parameters.liveRuntimeBuildConfig) }}
    - ${{ 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,
@@@ -323,8 -325,8 +325,8 @@@
      - libraries_build_allconfigurations_Windows_NT_x64_Release
    - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
      - ${{ each platform in parameters.platforms }}:
-       - coreclr_product_build_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }}
+       - ${{ parameters.runtimeFlavor }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}
 -      - libraries_build_netcoreapp_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
 +      - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
  
    steps:
  

diff --cc eng/pipelines/libraries/base-job.yml
Simple merge

diff --cc eng/pipelines/libraries/build-job.yml
Simple merge

diff --cc eng/pipelines/libraries/build-test-job.yml
index cdd5f25,b122fa3..15a0540
--- 1/eng/pipelines/libraries/build-test-job.yml
--- 2/eng/pipelines/libraries/build-test-job.yml
+++ b/eng/pipelines/libraries/build-test-job.yml
@@@ -3,9 -3,9 +3,9 @@@ parameters
    osGroup: ''
    osSubgroup: ''
    archType: ''
 -  framework: netcoreapp
 +  framework: ''
    isOfficialBuild: false
-   liveCoreClrBuildConfig: ''
+   liveRuntimeBuildConfig: ''
    timeoutInMinutes: 150
    container: ''
    publishTestArtifacs: true

diff --cc eng/pipelines/libraries/helix-queues-setup.yml
Simple merge

diff --cc eng/pipelines/libraries/helix.yml
Simple merge

diff --cc eng/pipelines/libraries/outerloop.yml
index 100ed43,5edc57a..c9b5028
--- 1/eng/pipelines/libraries/outerloop.yml
--- 2/eng/pipelines/libraries/outerloop.yml
+++ b/eng/pipelines/libraries/outerloop.yml
@@@ -61,9 -61,10 +61,9 @@@ jobs
        jobParameters:
          isOfficialBuild: ${{ variables['isOfficialBuild'] }}
          isFullMatrix: ${{ variables['isFullMatrix'] }}
 -        framework: netcoreapp
          runTests: true
          testScope: outerloop
-         liveCoreClrBuildConfig: release
+         liveRuntimeBuildConfig: release
    
    - ${{ if eq(variables['isFullMatrix'], false) }}:
      - template: /eng/pipelines/common/platform-matrix.yml
@@@ -82,9 -83,10 +82,9 @@@
          jobParameters:
            isOfficialBuild: ${{ variables['isOfficialBuild'] }}
            isFullMatrix: ${{ variables['isFullMatrix'] }}
 -          framework: netcoreapp
            runTests: true
            testScope: outerloop
-           liveCoreClrBuildConfig: release
+           liveRuntimeBuildConfig: release
  
    - ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
      - template: /eng/pipelines/common/platform-matrix.yml

diff --cc eng/pipelines/libraries/run-test-job.yml
index ceb75b2,1f2de2a..17aab78
--- 1/eng/pipelines/libraries/run-test-job.yml
--- 2/eng/pipelines/libraries/run-test-job.yml
+++ b/eng/pipelines/libraries/run-test-job.yml
@@@ -3,9 -3,10 +3,10 @@@ parameters
    osGroup: ''
    osSubgroup: ''
    archType: ''
 -  framework: netcoreapp
 +  framework: ''
    isOfficialBuild: false
-   liveCoreClrBuildConfig: ''
+   liveRuntimeBuildConfig: ''
+   runtimeFlavor: 'coreclr'
    timeoutInMinutes: 150
    pool: ''
    testScope: ''
@@@ -37,14 -39,10 +39,14 @@@ 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) }}
+       - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+         - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
  
        variables:
          - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}

diff --cc eng/pipelines/runtime.yml
index 0164540,63de290..3a91ac7
--- 1/eng/pipelines/runtime.yml
--- 2/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@@ -218,7 -285,8 +285,7 @@@ jobs
      - ${{ if eq(variables['isFullMatrix'], false) }}:
        - Windows_NT_x86
      jobParameters:
-       liveCoreClrBuildConfig: release
 -      framework: netcoreapp
+       liveRuntimeBuildConfig: release
        condition: >-
          or(
            eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@@ -416,7 -484,29 +483,28 @@@
            eq(variables['isFullMatrix'], true))
  
  #
- # Libraries Release Test Execution against a release runtime
+ # Libraries Release Test Execution against a release mono runtime.
+ #
+ - template: /eng/pipelines/common/platform-matrix.yml
+   parameters:
+     jobTemplate: /eng/pipelines/libraries/run-test-job.yml
+     runtimeFlavor: mono
+     buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+     platforms:
+     # - Windows_NT_x64
+     - OSX_x64
+     - Linux_x64
+     helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+     jobParameters:
+       isOfficialBuild: false
+       isFullMatrix: ${{ variables.isFullMatrix }}
 -      framework: netcoreapp
+       testScope: innerloop
+       liveRuntimeBuildConfig: release
+       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
+       dependsOnTestArchitecture: x64
+ 
+ #
+ # Libraries Release Test Execution against a release coreclr runtime
  # Only when the PR contains a libraries change
  #
  - template: /eng/pipelines/common/platform-matrix.yml
@@@ -429,8 -519,9 +517,8 @@@
      jobParameters:
        isOfficialBuild: false
        isFullMatrix: ${{ variables.isFullMatrix }}
 -      framework: netcoreapp
        testScope: innerloop
-       liveCoreClrBuildConfig: release
+       liveRuntimeBuildConfig: release
        dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
        dependsOnTestArchitecture: x64
        condition: >-
@@@ -461,8 -552,9 +549,8 @@@
      jobParameters:
        isOfficialBuild: false
        isFullMatrix: ${{ variables.isFullMatrix }}
 -      framework: netcoreapp
        testScope: innerloop
-       liveCoreClrBuildConfig: release
+       liveRuntimeBuildConfig: release
        dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
        dependsOnTestArchitecture: x64
        condition: >-
@@@ -484,10 -576,9 +572,8 @@@
      helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
      helixQueueGroup: libraries
      jobParameters:
 -      framework: netcoreapp
        testScope: innerloop
-       liveCoreClrBuildConfig: checked
+       liveRuntimeBuildConfig: checked
        dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
        dependsOnTestArchitecture: x64
        condition: >-
@@@ -506,8 -597,9 +592,8 @@@
      helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
      helixQueueGroup: libraries
      jobParameters:
 -      framework: netcoreapp
        testScope: innerloop
-       liveCoreClrBuildConfig: checked
+       liveRuntimeBuildConfig: checked
        dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
        dependsOnTestArchitecture: x64
        condition: >-
@@@ -528,8 -620,9 +614,8 @@@
      helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
      helixQueueGroup: libraries
      jobParameters:
 -      framework: netcoreapp
        testScope: innerloop
-       liveCoreClrBuildConfig: checked
+       liveRuntimeBuildConfig: checked
        dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
        dependsOnTestArchitecture: x64
        condition: >-

diff --cc src/libraries/Directory.Build.props
Simple merge

diff --cc src/libraries/sendtohelix.proj
Simple merge