Merge pull request #54591 from dotnet/merges/release/dev16.11-vs-deps…

…-to-release/dev17.0-vs-deps Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps
dotnet · Jul 4, 2021 · 5db0d4c · 5db0d4c
2 parents f02b222 + e73cf01
commit 5db0d4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/azure-pipelines-pr-validation.yml b/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

diff --git a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj b/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)"/>