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

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:

* @dotnet-maestro[bot]
* @JanProvaznik
* @YuliiaKovalova
* @github-actions[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.

Author: GangWang01

.vsts-dotnet.yml

@@ -6,7 +6,6 @@ trigger:
 # Once they exist, we should define these as "runtime parameters"
 # https://github.com/Microsoft/azure-pipelines-yaml/pull/129
 # variables:
-#   SignType: real
 #   SkipApplyOptimizationData: false
 
 parameters:
@@ -22,6 +21,10 @@ parameters:
   displayName: Enable Signing Validation
   type: boolean
   default: true
+- name: signTypeParameter
+  displayName: Sign Type
+  type: string
+  default: 'real'
 
 variables:
   # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script.
@@ -114,6 +117,7 @@ extends:
         parameters:
           isExperimental: false
           enableComponentGovernance: true
+          signTypeParameter: ${{ parameters.signTypeParameter }}
           enableOptProf: ${{ parameters.enableOptProf }}
 
     - template: /eng/common/templates-official/post-build/post-build.yml@self

azure-pipelines/.vsts-dotnet-build-jobs.yml

@@ -6,6 +6,9 @@ parameters:
 - name: enableComponentGovernance
   type: boolean
   default: false
+- name: signTypeParameter
+  type: string
+  default: 'test'
 - name: enableOptProf
   type: boolean
   default: false
@@ -58,14 +61,14 @@ jobs:
   - task: MicroBuildSigningPlugin@4
     displayName: Install MicroBuild plugin
     inputs:
-      signType: $(SignType)
+      signType: ${{ parameters.signTypeParameter }}
       zipSources: false
       feedSource: https://devdiv.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-      ${{ if and(eq(variables['SignType'], 'real'), eq(variables['System.TeamProject'], 'DevDiv')) }}:
+      ${{ if and(eq(parameters.signTypeParameter, 'real'), eq(variables['System.TeamProject'], 'DevDiv')) }}:
         ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
+    condition: and(succeeded(), in('${{ parameters.signTypeParameter }}', 'test', 'real'))
 
   - task: MicroBuildOptProfPlugin@6
     inputs:
@@ -89,12 +92,14 @@ jobs:
               /p:VisualStudioIbcSourceBranchName=$(SourceBranch)
               /p:VisualStudioDropAccessToken=$(System.AccessToken)
               /p:VisualStudioDropName=$(VisualStudio.DropName)
-              /p:DotNetSignType=$(SignType)
+              /p:DotNetSignType=${{ parameters.signTypeParameter }}
               /p:TeamName=MSBuild
               /p:DotNetPublishUsingPipelines=true
               /p:VisualStudioIbcDrop=$(OptProfDrop)
               /p:GenerateSbom=true
               /p:SuppressFinalPackageVersion=${{ parameters.isExperimental }}
+              /p:IsExperimental=${{ parameters.isExperimental }}
+
     displayName: Build
     condition: succeeded()
 

azure-pipelines/.vsts-dotnet-exp-perf.yml

@@ -6,7 +6,6 @@ trigger:
 # Once they exist, we should define these as "runtime parameters"
 # https://github.com/Microsoft/azure-pipelines-yaml/pull/129
 # variables:
-#   SignType: test
 #   SkipApplyOptimizationData: false
 
 parameters:
@@ -18,6 +17,10 @@ parameters:
   displayName: Enable Signing Validation
   type: boolean
   default: false
+- name: signTypeParameter
+  displayName: Sign Type
+  type: string
+  default: 'test'
 - name: enableOptProf
   displayName: Enable OptProf data collection for this build
   type: boolean
@@ -77,6 +80,7 @@ extends:
         parameters:
           isExperimental: true
           enableComponentGovernance: false
+          signTypeParameter: ${{ parameters.signTypeParameter }}
           enableOptProf: ${{ parameters.enableOptProf }}
 
     - template: /eng/common/templates/post-build/post-build.yml@self

azure-pipelines/vs-insertion-experimental.yml

@@ -180,3 +180,4 @@ extends:
             InsertionReviewers: MSBuild
             CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
             InsertionBuildPolicy: Request Perf DDRITs
+

eng/Versions.props

@@ -2,11 +2,15 @@
 <!-- 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.11.45</VersionPrefix>
+    <VersionPrefix>17.11.46</VersionPrefix>
     <DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <PackageValidationBaselineVersion>17.10.4</PackageValidationBaselineVersion>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
+
+    <!-- differentiate experimental insertions to avoid package id conflicts, 
+    it has to be alphabetically after "preview" to avoid downgrade errors in VS -->
+    <PreReleaseVersionLabel Condition="'$(IsExperimental)' == 'true'">test</PreReleaseVersionLabel>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <!-- Workaround for https://github.com/dotnet/roslyn/issues/35793 -->
     <SemanticVersioningV1>true</SemanticVersioningV1>