[automated] Merge branch 'vs16.11' => 'vs17.8'

.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:
@@ -18,6 +17,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.
@@ -39,6 +42,11 @@ variables:
     value: .NETCore
   - name: _DotNetValidationArtifactsCategory
     value: .NETCoreValidation
+  # For now skipping apply optimization data for vs16.11, because the run with real signed bits requires being fully automated
+  # while there is no available optimization data for vs16.11.
+  - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/vs16.11') }}:
+    - name: SkipApplyOptimizationData
+      value: true
   - name: EnableReleaseOneLocBuild
     value: false
   - name: Codeql.Enabled
@@ -103,6 +111,7 @@ extends:
         parameters:
           isExperimental: false
           enableComponentGovernance: true
+          signTypeParameter: ${{ parameters.signTypeParameter }}
 
     - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:

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

@@ -6,6 +6,9 @@ parameters:
 - name: enableComponentGovernance
   type: boolean
   default: false
+- name: signTypeParameter
+  type: string
+  default: 'test'
 
 jobs:
 - job: Windows_NT
@@ -43,14 +46,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:
@@ -73,7 +76,7 @@ jobs:
               /p:VisualStudioIbcSourceBranchName=$(SourceBranch)
               /p:VisualStudioDropAccessToken=$(System.AccessToken)
               /p:VisualStudioDropName=$(VisualStudio.DropName)
-              /p:DotNetSignType=$(SignType)
+              /p:DotNetSignType=${{ parameters.signTypeParameter }}
               /p:DotNetPublishToBlobFeed=true
               /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
               /p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
@@ -85,6 +88,8 @@ jobs:
               /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

@@ -5,7 +5,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:
@@ -17,6 +16,10 @@ parameters:
   displayName: Enable Signing Validation
   type: boolean
   default: false
+- name: signTypeParameter
+  displayName: Sign Type
+  type: string
+  default: 'test'
 
 variables:
   # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script.
@@ -72,6 +75,7 @@ extends:
         parameters:
           isExperimental: true
           enableComponentGovernance: false
+          signTypeParameter: ${{ parameters.signTypeParameter }}
 
     - template: /eng/common/templates/post-build/post-build.yml@self
       parameters:

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.8.39</VersionPrefix>
+    <VersionPrefix>17.8.40</VersionPrefix>
     <DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <PackageValidationBaselineVersion>17.7.0</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>