Merge branch 'main' into ChangeSlnToSolutionWithAlias

Author: nagilson

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 &&

src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch

@@ -0,0 +1,23 @@
+From 3e953b23493f51d58d20b154e4fb13e8a144168a Mon Sep 17 00:00:00 2001
+From: Jan Krivanek <[email protected]>
+Date: Tue, 8 Oct 2024 08:08:29 +0200
+Subject: [PATCH] Remove BuildXL feed
+
+Backport: https://github.com/dotnet/msbuild/pull/10765
+
+---
+ NuGet.config | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/NuGet.config b/NuGet.config
+index 17cb1b80c05..659ab421680 100644
+--- a/NuGet.config
++++ b/NuGet.config
+@@ -18,7 +18,6 @@
+     <add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
+     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+     <add key="dotnet9" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json" />
+-    <add key="BuildXL" value="https://pkgs.dev.azure.com/ms/BuildXL/_packaging/BuildXL/nuget/v3/index.json" />
+     <add key="msbuild17.12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-95c7bf01-1/nuget/v3/index.json" />
+   </packageSources>
+   <disabledPackageSources>