[automated] Merge branch 'vs17.10' => 'vs17.11' (#12442)

I detected changes in the vs17.10 branch which have not been merged yet
to vs17.11. I'm a robot and am configured to help you automatically keep
vs17.11 up to date, so I've opened this PR.

This PR merges commits made on vs17.10 by the following committers:

* @JanProvaznik
* @YuliiaKovalova
* @github-actions[bot]
* @dotnet-maestro[bot]
* @GangWang01

## Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete
this PR by creating a merge commit, *not* a squash or rebase commit.

<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />

If this repo does not allow creating merge commits from the GitHub UI,
use command line instructions.

## Instructions for merging via command line

Run these commands to merge this pull request from the command line.

``` sh
git fetch
git checkout vs17.10
git pull --ff-only
git checkout vs17.11
git pull --ff-only
git merge --no-ff vs17.10

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11
```

<details>
<summary>or if you are using SSH</summary>

```
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11
```

</details>


After PR checks are complete push the branch
```
git push
```

## Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].

[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

## Instructions for updating this pull request

Contributors to this repo have permission update this pull request by
pushing to the branch 'merge/vs17.10-to-vs17.11'. This can be done to
resolve conflicts or make other changes to this pull request before it
is merged.
The provided examples assume that the remote is named 'origin'. If you
have a different remote name, please replace 'origin' with the name of
your remote.

```
git fetch
git checkout -b merge/vs17.10-to-vs17.11 origin/vs17.11
git pull https://github.com/dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11
```

<details>
    <summary>or if you are using SSH</summary>

```
git fetch
git checkout -b merge/vs17.10-to-vs17.11 origin/vs17.11
git pull [email protected]:dotnet/msbuild merge/vs17.10-to-vs17.11
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11
```

</details>

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or
issues.
Also, if this PR was generated incorrectly, help us fix it. See
https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

---------

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Co-authored-by: Nguyen Huu Linh <[email protected]>
Co-authored-by: YuliiaKovalova <[email protected]>
Co-authored-by: huulinh99 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <[email protected]>
Co-authored-by: Jan Provazník <[email protected]>

Author: 6 people

.vsts-dotnet.yml

@@ -1,8 +1,6 @@
 trigger:
 - main
 - vs*
-- exp/*
-- perf/*
 
 # If defined here, these values are not overrideable
 # Once they exist, we should define these as "runtime parameters"
@@ -16,10 +14,14 @@ parameters:
   displayName: Optional OptProfDrop Override
   type: string
   default: 'default'
-- name: EnableOptProf
+- name: enableOptProf
   displayName: Enable OptProf data collection for this build
   type: boolean
   default: true
+- name: enableSigningValidation
+  displayName: Enable Signing Validation
+  type: boolean
+  default: true
 
 variables:
   # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script.
@@ -34,7 +36,7 @@ variables:
   # if OptProfDropName is set as a parameter, set OptProfDrop to the parameter and unset SourceBranch
   - ${{ if ne(parameters.OptProfDropName, 'default') }}:
     - name: OptProfDrop
-      value: ${{parameters.OptProfDropName}}
+      value: ${{ parameters.OptProfDropName }}
     - name: SourceBranch
       value: ''
   # Override SkipApplyOptimizationData to true when disabling OptProf data collection
@@ -77,268 +79,50 @@ extends:
         enabled: false
 
     stages:
+    - ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/heads/vs'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
+      - stage: localization
+        displayName: Localization
+        jobs:
+        # The localization setup for release/ branches. Note difference in LclPackageId. main branch is handled separately below.
+        # Used for vs17.2, vs17.4, vs17.6 etc. branches only.
+        # When the branch is setup for localization (the localization ticket needs to be created - https://aka.ms/ceChangeLocConfig, requesting change from one release branch to another),
+        #  set 'EnableReleaseOneLocBuild' to true.
+        - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/vs') }}:
+          - template: /eng/common/templates-official/job/onelocbuild.yml@self
+            parameters:
+              MirrorRepo: 'msbuild'
+              LclSource: lclFilesfromPackage
+              LclPackageId: 'LCL-JUNO-PROD-MSBUILDREL'
+              MirrorBranch: ${{ replace(variables['Build.SourceBranch'], 'refs/heads/', '') }}
+              JobNameSuffix: '_release'
+              condition: ${{ variables.EnableReleaseOneLocBuild }}
+        # The localization setup for main branch. Note difference in package ID. Should not be used with release/ branches.
+        - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
+          - template: /eng/common/templates-official/job/onelocbuild.yml@self
+            parameters:
+              MirrorRepo: 'msbuild'
+              LclSource: lclFilesfromPackage
+              LclPackageId: 'LCL-JUNO-PROD-MSBUILD'
+              MirrorBranch: 'main'
+              JobNameSuffix: '_main'
+              condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
+
     - stage: build
       displayName: Build
-
       jobs:
-      # The localization setup for release/ branches. Note difference in LclPackageId. main branch is handled separately below.
-      # Used for vs17.2, vs17.4, vs17.6 etc. branches only.
-      # When the branch is setup for localization (the localization ticket needs to be created - https://aka.ms/ceChangeLocConfig, requesting change from one release branch to another),
-      #  set 'EnableReleaseOneLocBuild' to true.
-      - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/vs') }}:
-        - template: /eng/common/templates-official/job/onelocbuild.yml@self
-          parameters:
-            MirrorRepo: 'msbuild'
-            LclSource: lclFilesfromPackage
-            LclPackageId: 'LCL-JUNO-PROD-MSBUILDREL'
-            MirrorBranch: ${{ replace(variables['Build.SourceBranch'], 'refs/heads/', '') }}
-            JobNameSuffix: '_release'
-            condition: ${{ variables.EnableReleaseOneLocBuild }}
-      # The localization setup for main branch. Note difference in package ID. Should not be used with release/ branches.
-      - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
-        - template: /eng/common/templates-official/job/onelocbuild.yml@self
-          parameters:
-            MirrorRepo: 'msbuild'
-            LclSource: lclFilesfromPackage
-            LclPackageId: 'LCL-JUNO-PROD-MSBUILD'
-            MirrorBranch: 'main'
-            JobNameSuffix: '_main'
-            condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
-
-      - job: Windows_NT
-        pool:
-          name: VSEngSS-MicroBuild2022-1ES
-          demands:
-          - agent.os -equals Windows_NT
-
-        timeoutInMinutes: 180
-
-        variables:
-        - group: Publish-Build-Assets
-        - name: TeamName
-          value: MSBuild
-        - name: VisualStudio.MajorVersion
-          value: 17
-        - name: VisualStudio.ChannelName
-          value: 'int.d17.11'  # MSBuild's vs17.11 branch corresponds to this VS channel
-        - name: VisualStudio.DropName
-          value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
-
-        steps:
-        - task: NuGetToolInstaller@1
-          displayName: 'Install NuGet.exe'
-        - pwsh: Get-MpComputerStatus
-
-        - pwsh: Set-MpPreference -DisableRealtimeMonitoring $true
-
-        - task: PowerShell@2
-          displayName: Setup Private Feeds Credentials
-          inputs:
-            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-            arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
-          env:
-            Token: $(dn-bot-dnceng-artifact-feeds-rw)
-
-        - task: NuGetCommand@2
-          displayName: Restore internal tools
-          inputs:
-            command: restore
-            feedsToUse: config
-            restoreSolution: 'eng\common\internal\Tools.csproj'
-            nugetConfigPath: 'eng\common\internal\NuGet.config'
-            restoreDirectory: '$(Build.SourcesDirectory)\.packages'
-
-        - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
-          inputs:
-            signType: $(SignType)
-            zipSources: false
-          condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
-
-        - task: MicroBuildOptProfPlugin@6
-          inputs:
-            ProfilingInputsDropName: '$(VisualStudio.DropName)'
-            ShouldSkipOptimize: true
-            AccessToken: '$(System.AccessToken)'
-            feedSource: 'https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
-          displayName: 'Install OptProf Plugin'
-          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
-
-        # Required by MicroBuildBuildVSBootstrapper
-        - task: MicroBuildSwixPlugin@4
-          inputs:
-            dropName: $(VisualStudio.DropName)
-
-        - script: eng/CIBuild.cmd
-                    -configuration $(BuildConfiguration)
-                    -officialBuildId $(Build.BuildNumber)
-                    -officialSkipApplyOptimizationData $(SkipApplyOptimizationData)
-                    /p:RepositoryName=$(Build.Repository.Name)
-                    /p:VisualStudioIbcSourceBranchName=$(SourceBranch)
-                    /p:VisualStudioDropAccessToken=$(System.AccessToken)
-                    /p:VisualStudioDropName=$(VisualStudio.DropName)
-                    /p:DotNetSignType=$(SignType)
-                    /p:TeamName=MSBuild
-                    /p:DotNetPublishUsingPipelines=true
-                    /p:VisualStudioIbcDrop=$(OptProfDrop)
-                    /p:GenerateSbom=true
-                    /p:SuppressFinalPackageVersion=$(IsExperimental)
-          displayName: Build
-          condition: succeeded()
-
-        # Required by Microsoft policy
-        - template: eng\common\templates-official\steps\generate-sbom.yml@self
-
-        # Publish OptProf configuration files
-        - task: 1ES.PublishArtifactsDrop@1
-          inputs:
-            dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
-            buildNumber: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)'
-            sourcePath: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
-            toLowerCase: false
-            usePat: true
-          displayName: 'OptProf - Publish to Artifact Services - ProfilingInputs'
-          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
-
-        # Build VS bootstrapper
-        # Generates $(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json
-        - task: MicroBuildBuildVSBootstrapper@3
-          inputs:
-            vsMajorVersion: $(VisualStudio.MajorVersion)
-            channelName: $(VisualStudio.ChannelName)
-            manifests: $(VisualStudio.SetupManifestList)
-            outputFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
-            bootstrapperCoreVersion:
-          displayName: 'OptProf - Build VS bootstrapper'
-          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
-
-        # Publish run settings
-        - task: PowerShell@2
-          inputs:
-            filePath: eng\common\sdk-task.ps1
-            arguments: -configuration $(BuildConfiguration)
-                      -task VisualStudio.BuildIbcTrainingSettings
-                      /p:VisualStudioDropName=$(VisualStudio.DropName)
-                      /p:BootstrapperInfoPath=$(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json
-                      /p:VisualStudioIbcTrainingSettingsPath=$(Build.SourcesDirectory)\eng\config\OptProf.runsettings
-          displayName: 'OptProf - Build IBC training settings'
-          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
-
-        # Publish bootstrapper info
-        - task: 1ES.PublishBuildArtifacts@1
-          inputs:
-            PathtoPublish: $(Build.StagingDirectory)\MicroBuild\Output
-            ArtifactName: MicroBuildOutputs
-            ArtifactType: Container
-          displayName: 'OptProf - Publish Artifact: MicroBuildOutputs'
-          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
-
-        - task: 1ES.PublishBuildArtifacts@1
-          displayName: 'Publish Artifact: logs'
-          inputs:
-            PathtoPublish: 'artifacts\log\$(BuildConfiguration)'
-            ArtifactName: logs
-          condition: succeededOrFailed()
-
-        - task: 1ES.PublishPipelineArtifact@1
-          displayName: 'Publish Artifact: bin'
-          inputs:
-            path: 'artifacts\bin'
-            artifactName: bin
-          condition: succeededOrFailed()
-
-        # Publishes setup VSIXes to a drop.
-        # Note: The insertion tool looks for the display name of this task in the logs.
-        - task: 1ES.MicroBuildVstsDrop@1
-          displayName: Upload VSTS Drop
-          inputs:
-            dropName: $(VisualStudio.DropName)
-            dropFolder: 'artifacts\VSSetup\$(BuildConfiguration)\Insertion'
-            dropRetentionDays: '30' # extended by insertion + VS release
-            accessToken: '$(System.AccessToken)'
-            dropServiceUri: 'https://devdiv.artifacts.visualstudio.com'
-            vsDropServiceUri: 'https://vsdrop.corp.microsoft.com/file/v1'
-          condition: succeeded()
-
-        # Publish an artifact that the RoslynInsertionTool is able to find by its name.
-        - task: 1ES.PublishBuildArtifacts@1
-          displayName: 'Publish Artifact: VSSetup'
-          inputs:
-            PathtoPublish: 'artifacts\VSSetup\$(BuildConfiguration)'
-            ArtifactName: VSSetup
-          condition: succeeded()
-
-        # Archive NuGet packages to DevOps.
-        # Publish our NuPkgs as an artifact. The name of this artifact must be PackageArtifacts as the
-        # arcade templates depend on the name.
-        - task: 1ES.PublishBuildArtifacts@1
-          displayName: 'Publish Artifact: packages'
-          inputs:
-            PathtoPublish: 'artifacts\packages\$(BuildConfiguration)'
-            ArtifactName: PackageArtifacts
-          condition: succeeded()
-
-        # Publish "IntelliSense" XSD files to their own artifact
-        # so it can be consumed by the insertion-to-VS job
-        - task: 1ES.PublishPipelineArtifact@1
-          displayName: 'Publish Artifact: xsd'
-          inputs:
-            path: 'artifacts\xsd'
-            artifactName: xsd
-          condition: succeeded()
-
-        # Publish Asset Manifests for Build Asset Registry job
-        - task: 1ES.PublishBuildArtifacts@1
-          displayName: Publish Asset Manifests
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(BuildConfiguration)/AssetManifest'
-            ArtifactName: AssetManifests
-          condition: succeeded()
-
-        # Tag the build at the very end when we know it's been successful.
-        - task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0
-          displayName: Tag build as ready for optimization training
-          inputs:
-            tags: 'ready-for-training'
-          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
-
-        - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
-          displayName: Execute cleanup tasks
-          condition: succeededOrFailed()
-
-        - template: /eng/common/templates-official/steps/component-governance.yml@self
-          parameters:
-            ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/heads/vs'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
-              disableComponentGovernance: false
-            ${{ else }}:
-              disableComponentGovernance: true
-
-      - template: /eng/common/templates-official/jobs/source-build.yml@self
-        parameters:
-          platforms:
-            - name: Managed
-              pool:
-                name: AzurePipelines-EO
-                image: 1ESPT-Ubuntu22.04
-                os: linux
-
-      - template: /eng/common/templates-official/job/publish-build-assets.yml@self
+      - template: /azure-pipelines/.vsts-dotnet-build-jobs.yml@self
         parameters:
-          enablePublishBuildArtifacts: true
-          publishUsingPipelines: true
-          dependsOn:
-            - Windows_NT
-            - Source_Build_Managed
-          pool:
-            name: $(DncEngInternalBuildPool)
-            image: $(WindowsImage)
-            os: windows
+          isExperimental: false
+          enableComponentGovernance: true
+          enableOptProf: ${{ parameters.enableOptProf }}
 
-    - template: eng\common\templates-official\post-build\post-build.yml@self
+    - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:
         publishingInfraVersion: 3
         enableSymbolValidation: true
         enableSourceLinkValidation: false
         enableNugetValidation: false
+        enableSigningValidation: ${{ parameters.enableSigningValidation }}
         SDLValidationParameters:
           enable: true
           continueOnError: false