Merge branch 'main' into merge/release/7.0-to-main

3 files changed, 23 insertions, 18 deletions

diff --git a/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml b/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml
index 76ae879fb7..cbf529762b 100644
--- a/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml
+++ b/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml
@@ -26,7 +26,7 @@ jobs:
       - job: Merge_Azure_DevOps_Branches
         enableSBOM: false
         pool:
-          name: NetCore1ESPool-Svc-Internal
+          name: NetCore1ESPool-Internal
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
         variables:
         - name: WorkingDirectoryName
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 10808bf3f5..37d4749e63 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -542,7 +542,6 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       disableComponentGovernance: true
-      skipComponentGovernanceDetection: true
       artifacts:
       - name: Linux_musl_x64_Logs
         path: artifacts/log/
@@ -729,7 +728,13 @@ stages:
         container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab'
         buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
         skipPublishValidation: true
-        timeoutInMinutes: 120
+        jobProperties:
+          timeoutInMinutes: 120
+          variables:
+            # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
+            DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
+            # Log environment variables in binary logs to ease debugging
+            MSBUILDLOGALLENVIRONMENTVARIABLES: true
 
   # Publish to the BAR and perform source indexing. Wait until everything else is done.
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -766,10 +771,11 @@ stages:
               - Helix_x64
           - Source_Build_Managed
         pool:
-          name: NetCore1ESPool-Svc-Internal
+          name: NetCore1ESPool-Internal
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
         publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
         enablePublishBuildArtifacts: true # publish artifacts/log files
+        publishAssetsImmediately: true # Don't use a separate stage for darc publishing.
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
       - job: SourceIndexUpload
         displayName: Upload indexable solution
@@ -804,7 +810,7 @@ stages:
               - Helix_x64
           - Source_Build_Managed
         pool:
-          name: NetCore1ESPool-Svc-Internal
+          name: NetCore1ESPool-Internal
           # Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
           demands: ImageOverride -equals Build.Server.Amd64.VS2019
         steps:
@@ -840,3 +846,4 @@ stages:
       enableSigningValidation: false
       enableNugetValidation: false
       publishInstallersAndChecksums: true
+      publishAssetsImmediately: true
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 2025c53f8f..5d6f1eeea9 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -33,8 +33,6 @@
 #       This build definition is enabled for code signing. (Only applies to Windows)
 #   buildDirectory: string
 #       Specifies what directory to run build.sh/cmd
-#   skipComponentGovernanceDetection: boolean
-#       Determines if component governance detection can be skipped
 #   isAzDOTestingJob: boolean
 #       Determines if this job runs tests on the AzDO build agent. Controls some (currently Windows-only)
 #       installations and enables test publication (unless enablePublishTestResults is overridden).
@@ -57,7 +55,6 @@ parameters:
   condition: ''
   codeSign: false
   buildDirectory: $(System.DefaultWorkingDirectory)/eng/
-  skipComponentGovernanceDetection: false
   isAzDOTestingJob: false
   enablePublishTestResults: ''
 
@@ -112,17 +109,17 @@ jobs:
           vmImage: ubuntu-20.04
         ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            name: NetCore-Svc-Public
+            name: NetCore-Public
             demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-            name: NetCore1ESPool-Svc-Internal
+            name: NetCore1ESPool-Internal
             demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
       ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
-          name: NetCore-Svc-Public
+          name: NetCore-Public
           demands: ImageOverride -equals 1es-windows-2022-open
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          name: NetCore1ESPool-Svc-Internal
+          name: NetCore1ESPool-Internal
           # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
           demands: ImageOverride -equals 1es-windows-2022
     ${{ if ne(parameters.container, '') }}:
@@ -157,6 +154,7 @@ jobs:
     - LANGUAGE: 'en_US.UTF-8'
     # Log environment variables in binary logs to ease debugging
     - MSBUILDLOGALLENVIRONMENTVARIABLES: true
+    - skipComponentGovernanceDetection: ${{ ne(variables['System.TeamProject'], 'internal') }}
     steps:
     - ${{ if ne(parameters.agentOs, 'Windows') }}:
       - script: df -h
@@ -224,6 +222,8 @@ jobs:
               # Include the variables we always want.
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
+              # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
+              DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
               # Expand provided `env:` properties, if any.
               ${{ if step.env }}:
                 ${{ step.env }}
@@ -235,12 +235,16 @@ jobs:
           env:
             COMPlus_DbgEnableMiniDump: 1
             COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
+            # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
+            DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
       - ${{ if ne(parameters.agentOs, 'Windows') }}:
         - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.sh
           env:
             COMPlus_DbgEnableMiniDump: 1
             COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
+            # !temporary! Remove as soon as .NET SDK includes a new-enough `msbuild` to make this hack unnecessary
+            DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER: true
 
     - ${{ parameters.afterBuild }}
 
@@ -268,12 +272,6 @@ jobs:
         continueOnError: true
         condition: always()
 
-    # Run component detection after all successful Build:* jobs unless overridden e.g. for Alpine build.
-    # Make sure auto-injected component detection does _not_ execute in other jobs nor when overridden.
-    - ${{ if or(not(startsWith(parameters.jobDisplayName, 'Build:')), eq(parameters.skipComponentGovernanceDetection, 'true')) }}:
-      - script:  echo "##vso[task.setvariable variable=CG_RAN]true"
-        displayName: 'Skip Component Detection'
-
     - ${{ each artifact in parameters.artifacts }}:
       - task: PublishBuildArtifacts@1
         displayName: Upload artifacts from ${{ artifact.path }}