Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-f8a73d83-1771-487e-b48d-c340eff4c20a

Author: Jason Zhai

NuGet.config

@@ -14,7 +14,7 @@
     <add key="darc-pub-dotnet-aspnetcore-1e7a7af" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-1e7a7af6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-4ae11fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-4ae11fa8/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-db5f601" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-db5f6012/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->

eng/Version.Details.xml

@@ -73,18 +73,18 @@
       <Sha>8be5676af1ccf568b258133788a24aedd1a80994</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.12.3">
+    <Dependency Name="Microsoft.Build" Version="17.12.6">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>4ae11fa8e4a86aef804cc79a42102641ad528106</Sha>
+      <Sha>db5f6012cb7f6e2dd7066c50c573c0d352713407</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.12.3-preview-24504-01">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.12.6-preview-24518-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>4ae11fa8e4a86aef804cc79a42102641ad528106</Sha>
+      <Sha>db5f6012cb7f6e2dd7066c50c573c0d352713407</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.3-preview-24504-01">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.6-preview-24518-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>4ae11fa8e4a86aef804cc79a42102641ad528106</Sha>
+      <Sha>db5f6012cb7f6e2dd7066c50c573c0d352713407</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.100-beta.24510.7">
@@ -379,14 +379,14 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24517.3">
+    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24521.3">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>deb758b7e7750826a75e937c7df5b97f19c510f8</Sha>
+      <Sha>f6920c348761980e1601632a2031920b24921772</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24517.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24521.3">
       <Uri>https://github.com/dotnet/test-templates</Uri>
-      <Sha>deb758b7e7750826a75e937c7df5b97f19c510f8</Sha>
+      <Sha>f6920c348761980e1601632a2031920b24921772</Sha>
       <SourceBuild RepoName="test-templates" ManagedOnly="true" />
     </Dependency>
     <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->

eng/Versions.props

@@ -98,7 +98,7 @@
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
     <!-- Supported versions -->
-    <MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24517.3</MicrosoftDotNetTestProjectTemplates90PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24521.3</MicrosoftDotNetTestProjectTemplates90PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -194,8 +194,8 @@
          then use that in Directory.Packages.props.
 
          At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
-    <MicrosoftBuildVersion>17.12.3</MicrosoftBuildVersion>
-    <MicrosoftBuildLocalizationVersion>17.12.3-preview-24504-01</MicrosoftBuildLocalizationVersion>
+    <MicrosoftBuildVersion>17.12.6</MicrosoftBuildVersion>
+    <MicrosoftBuildLocalizationVersion>17.12.6-preview-24518-05</MicrosoftBuildLocalizationVersion>
     <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
   </PropertyGroup>
   <PropertyGroup>

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs

@@ -98,7 +98,11 @@ private void RemoveExcludedAssemblyVersionPaths(Dictionary<string, Version?> sbS
         {
             string assemblyPath = sbSdkFileArray[i];
             Version? sbVersion = sbSdkAssemblyVersions[assemblyPath];
-            Version? msftVersion = msftSdkAssemblyVersions[assemblyPath];
+            if (!msftSdkAssemblyVersions.TryGetValue(assemblyPath, out Version? msftVersion))
+            {
+                sbSdkAssemblyVersions.Remove(assemblyPath);
+                continue;
+            }
 
             if (sbVersion is not null &&
                 msftVersion is not null &&
@@ -169,7 +173,7 @@ private string FindMatchingFilePath(string rootDir, Matcher matcher, string repr
             }
         }
 
-        Assert.Fail($"Unable to find matching file for '{representativeFile}' in '{rootDir}'.");
+        OutputHelper.WriteLine($"Unable to find matching file for '{representativeFile}' in '{rootDir}'.");
         return string.Empty;
     }