[automated] Merge branch 'vs17.11' => 'vs17.12' (#12103)

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

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

* @GangWang01
* @dotnet-maestro[bot]

## 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.11
git pull --ff-only
git checkout vs17.12
git pull --ff-only
git merge --no-ff vs17.11

# 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.11-to-vs17.12
```

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

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

</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.11-to-vs17.12'. 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.11-to-vs17.12 origin/vs17.12
git pull https://github.com/dotnet/msbuild merge/vs17.11-to-vs17.12
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12
```

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

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

</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.

Author: GangWang01

.vsts-dotnet.yml

@@ -16,6 +16,10 @@ parameters:
   displayName: Optional OptProfDrop Override
   type: string
   default: 'default'
+- name: EnableOptProf
+  displayName: Enable OptProf data collection for this build
+  type: boolean
+  default: true
 
 variables:
   # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script.
@@ -33,6 +37,10 @@ variables:
       value: ${{parameters.OptProfDropName}}
     - name: SourceBranch
       value: ''
+  # Override SkipApplyOptimizationData to true when disabling OptProf data collection
+  - ${{ if eq(parameters.EnableOptProf, false) }}:
+    - name: SkipApplyOptimizationData
+      value: true
   - name: EnableReleaseOneLocBuild
     value: false # Disable loc for vs17.12
   - name: Codeql.Enabled
@@ -159,6 +167,7 @@ extends:
             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
@@ -194,7 +203,7 @@ extends:
             toLowerCase: false
             usePat: true
           displayName: 'OptProf - Publish to Artifact Services - ProfilingInputs'
-          condition: succeeded()
+          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
 
         # Build VS bootstrapper
         # Generates $(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json
@@ -205,7 +214,7 @@ extends:
             manifests: $(VisualStudio.SetupManifestList)
             outputFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
           displayName: 'OptProf - Build VS bootstrapper'
-          condition: succeeded()
+          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
 
         # Publish run settings
         - task: PowerShell@2
@@ -217,7 +226,7 @@ extends:
                       /p:BootstrapperInfoPath=$(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json
                       /p:VisualStudioIbcTrainingSettingsPath=$(Build.SourcesDirectory)\eng\config\OptProf.runsettings
           displayName: 'OptProf - Build IBC training settings'
-          condition: succeeded()
+          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
 
         # Publish bootstrapper info
         - task: 1ES.PublishBuildArtifacts@1
@@ -226,7 +235,7 @@ extends:
             ArtifactName: MicroBuildOutputs
             ArtifactType: Container
           displayName: 'OptProf - Publish Artifact: MicroBuildOutputs'
-          condition: succeeded()
+          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
 
         - task: 1ES.PublishBuildArtifacts@1
           displayName: 'Publish Artifact: logs'
@@ -288,7 +297,7 @@ extends:
           displayName: Tag build as ready for optimization training
           inputs:
             tags: 'ready-for-training'
-          condition: succeeded()
+          condition: and(succeeded(), ${{ parameters.EnableOptProf }})
 
         - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
           displayName: Execute cleanup tasks

eng/Versions.props

@@ -2,7 +2,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
   <PropertyGroup>
-    <VersionPrefix>17.12.40</VersionPrefix>
+    <VersionPrefix>17.12.41</VersionPrefix>
     <DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>