Merge pull request #54589 from dotnet/merges/release/dev16.11-to-release/dev17.0

Merge release/dev16.11 to release/dev17.0

Author: RikkiGibson

azure-pipelines-pr-validation.yml

@@ -123,6 +123,7 @@ stages:
                    /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
                    /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
                    /p:DotnetPublishUsingPipelines=false
+                   /p:PreReleaseVersionLabel=pr-validation
       condition: succeeded()
 
     # Publish OptProf generated JSON files as a build artifact. This allows for easy inspection from

src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj

@@ -258,6 +258,7 @@
     <PropertyGroup>
       <_OptimizedNuGetPackageVersionSuffix Condition="'$(OfficialBuild)' != 'true'">vs-ci</_OptimizedNuGetPackageVersionSuffix>
       <_OptimizedNuGetPackageVersionSuffix Condition="'$(OfficialBuild)' == 'true'">vs-$(VersionSuffixDateStamp)-$(VersionSuffixBuildOfTheDayPadded)</_OptimizedNuGetPackageVersionSuffix>
+      <_OptimizedNuGetPackageVersionSuffix Condition="'$(PreReleaseVersionLabel)' == 'pr-validation'">pr-validation-$(VersionSuffixDateStamp)-$(VersionSuffixBuildOfTheDayPadded)</_OptimizedNuGetPackageVersionSuffix>
     </PropertyGroup>
 
     <MakeDir Directories="$(VisualStudioBuildPackagesDir)"/>