[vs16.11] Backport experimental build pipeline changes (#12476)

Author: JanProvaznik

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

@@ -88,6 +88,8 @@ jobs:
               /p:VisualStudioIbcDrop=$(OptProfDrop)
               /p:GenerateSbom=true
               /p:SuppressFinalPackageVersion=${{ parameters.isExperimental }}
+              /p:IsExperimental=${{ parameters.isExperimental }}
+
     displayName: Build
     condition: succeeded()
 

eng/Versions.props

@@ -2,10 +2,14 @@
 <!-- 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>16.11.12</VersionPrefix>
+    <VersionPrefix>16.11.13</VersionPrefix>
     <DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
     <PreReleaseVersionLabel>preview</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>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <CheckNotRecommendedTargetFramework>false</CheckNotRecommendedTargetFramework>