Merge branch 'v2.7'

microsoft · Feb 17, 2021 · d554088 · d554088
2 parents d35ea03 + 93213ef
commit d554088
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/azure-pipelines/variables/InsertPropsValues.ps1 b/azure-pipelines/variables/InsertPropsValues.ps1
@@ -2,7 +2,10 @@ $BinPath = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\..\bin\Packages\$env:
 
 $dirsToSearch = "$BinPath\NuGet\*.nupkg" |? { Test-Path $_ }
 $icv=@()
-if ($dirsToSearch) {
+
+# Avoid updating the .props world for an optprof run.
+# This avoids breaks in servicing branches when we insert a PublicRelease=false unstable package version.
+if ($dirsToSearch -and !$env:OPTPROF) {
     Get-ChildItem -Path $dirsToSearch |% {
         if ($_.Name -match "^(.*)\.(\d+\.\d+\.\d+(?:-.*?)?)(?:\.symbols)?\.nupkg$") {
             $id = $Matches[1]