Merge branch 'v16.9'

Author: AArnott

azure-pipelines/variables/InsertPropsValues.ps1

@@ -2,15 +2,16 @@ $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 analyzer updates that are unrelated and can cause build breaks
+# as well as 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]
             $version = $Matches[2]
-            # Avoid inserting analyzers in an optprof run.
-            if ($env:OPTPROF -ne 'true' -or $_.Name -notlike '*Analyzers*') {
-                $icv += "$id=$version"
-            }
+            $icv += "$id=$version"
         }
     }
 }