From fb2369f686c604fd7b979b301cd580ecb92cfedc Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Wed, 29 Jul 2026 16:51:36 +0200
Subject: [PATCH 01/13] Update SDK to latest main build

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 7c6689c57675..74ebed078430 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-preview.6.26318.108",
+    "version": "11.0.100-rc.1.26378.120",
     "paths": [
       ".dotnet",
       "$host$"
@@ -8,7 +8,7 @@
     "errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
   },
   "tools": {
-    "dotnet": "11.0.100-preview.6.26318.108",
+    "dotnet": "11.0.100-rc.1.26378.120",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

From 2850e11de616ec12133aa449c60cc02ce376a398 Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Fri, 31 Jul 2026 12:23:21 +0200
Subject: [PATCH 02/13] Update global.json

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index fabbeef2c639..517baace16ec 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-rc.1.26378.120",
+    "version": "11.0.100-rc.1.26380.103",
     "paths": [
       ".dotnet",
       "$host$"
@@ -8,7 +8,7 @@
     "errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
   },
   "tools": {
-    "dotnet": "11.0.100-rc.1.26378.120",
+    "dotnet": "11.0.100-rc.1.26380.103",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

From 170f61381abf582e0d80dae45e1ef42bb1c106ea Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 31 Jul 2026 11:32:43 +0000
Subject: [PATCH 03/13] Add workaround for NuGet pack with Arcade
 $CommonMetadataElements$ nuspec token

Co-authored-by: Youssef1313 <31348972+Youssef1313@users.noreply.github.com>
---
 eng/Workarounds.targets | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index c76cb18ddb3d..f47cdb1103c4 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -40,6 +40,39 @@
     </ItemGroup>
   </Target>
 
+  <!--
+    Workaround for https://github.com/NuGet/NuGet.Client/pull/7531 regression with Arcade nuspec templates.
+
+    NuGet.Client PR #7531 introduced GetPackOutputItemsTask (invoked during _GetOutputItemsFromPack).
+    When NuspecFile is set, this task reads the package ID directly from the nuspec XML via NuspecReader.GetId(),
+    overwriting the PackageId MSBuild property value. Arcade nuspec templates use the custom $CommonMetadataElements$
+    composite token for the entire <metadata> section - meaning there is no direct <id> XML element in the file.
+    NuspecReader.GetId() therefore returns an empty string, producing a broken output path like ".{version}.nupkg".
+
+    Fix: temporarily clear NuspecFile immediately before _GetOutputItemsFromPack runs, so GetPackOutputItemsTask
+    skips the nuspec-reading branch and uses the PackageId MSBuild property directly. Restore NuspecFile afterward
+    so that GenerateNuspec can still use the nuspec template as expected.
+
+    The upstream Arcade fix is tracked in https://github.com/dotnet/arcade/pull/17227.
+  -->
+  <Target Name="_SaveNuspecFileBeforePackOutputItems"
+          BeforeTargets="_GetOutputItemsFromPack"
+          Condition="'$(NuspecFile)' != ''">
+    <PropertyGroup>
+      <_SavedNuspecFileForPackOutputItems>$(NuspecFile)</_SavedNuspecFileForPackOutputItems>
+      <NuspecFile />
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="_RestoreNuspecFileAfterPackOutputItems"
+          AfterTargets="_GetOutputItemsFromPack"
+          Condition="'$(_SavedNuspecFileForPackOutputItems)' != ''">
+    <PropertyGroup>
+      <NuspecFile>$(_SavedNuspecFileForPackOutputItems)</NuspecFile>
+      <_SavedNuspecFileForPackOutputItems />
+    </PropertyGroup>
+  </Target>
+
   <!--
     Work around https://github.com/dotnet/aspnetcore/issues/62807
     Parallel builds race on shared project outputs: a dependency's CopyFilesToOutputDirectory

From 4bae9771a54aab6a09ae435ca3cdffeeb62ccaeb Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Fri, 7 Aug 2026 09:37:11 +0200
Subject: [PATCH 04/13] Update global.json

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 517baace16ec..549f3b28d102 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-rc.1.26380.103",
+    "version": "11.0.100-rc.1.26406.108",
     "paths": [
       ".dotnet",
       "$host$"
@@ -8,7 +8,7 @@
     "errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
   },
   "tools": {
-    "dotnet": "11.0.100-rc.1.26380.103",
+    "dotnet": "11.0.100-rc.1.26406.108",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

From e2e3d573df1afbd83d900a860c560419eb8d6cb0 Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Fri, 7 Aug 2026 09:38:25 +0200
Subject: [PATCH 05/13] Revert workaround

---
 eng/Workarounds.targets | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index f47cdb1103c4..c76cb18ddb3d 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -40,39 +40,6 @@
     </ItemGroup>
   </Target>
 
-  <!--
-    Workaround for https://github.com/NuGet/NuGet.Client/pull/7531 regression with Arcade nuspec templates.
-
-    NuGet.Client PR #7531 introduced GetPackOutputItemsTask (invoked during _GetOutputItemsFromPack).
-    When NuspecFile is set, this task reads the package ID directly from the nuspec XML via NuspecReader.GetId(),
-    overwriting the PackageId MSBuild property value. Arcade nuspec templates use the custom $CommonMetadataElements$
-    composite token for the entire <metadata> section - meaning there is no direct <id> XML element in the file.
-    NuspecReader.GetId() therefore returns an empty string, producing a broken output path like ".{version}.nupkg".
-
-    Fix: temporarily clear NuspecFile immediately before _GetOutputItemsFromPack runs, so GetPackOutputItemsTask
-    skips the nuspec-reading branch and uses the PackageId MSBuild property directly. Restore NuspecFile afterward
-    so that GenerateNuspec can still use the nuspec template as expected.
-
-    The upstream Arcade fix is tracked in https://github.com/dotnet/arcade/pull/17227.
-  -->
-  <Target Name="_SaveNuspecFileBeforePackOutputItems"
-          BeforeTargets="_GetOutputItemsFromPack"
-          Condition="'$(NuspecFile)' != ''">
-    <PropertyGroup>
-      <_SavedNuspecFileForPackOutputItems>$(NuspecFile)</_SavedNuspecFileForPackOutputItems>
-      <NuspecFile />
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_RestoreNuspecFileAfterPackOutputItems"
-          AfterTargets="_GetOutputItemsFromPack"
-          Condition="'$(_SavedNuspecFileForPackOutputItems)' != ''">
-    <PropertyGroup>
-      <NuspecFile>$(_SavedNuspecFileForPackOutputItems)</NuspecFile>
-      <_SavedNuspecFileForPackOutputItems />
-    </PropertyGroup>
-  </Target>
-
   <!--
     Work around https://github.com/dotnet/aspnetcore/issues/62807
     Parallel builds race on shared project outputs: a dependency's CopyFilesToOutputDirectory

From 987c3cbd34afb843cd322b6ba589309920ef6f3b Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Mon, 10 Aug 2026 12:11:34 +0200
Subject: [PATCH 06/13] Update global.json

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 549f3b28d102..fba7eb6b9724 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "11.0.100-rc.1.26406.108",
+    "version": "11.0.100-rc.1.26409.102",
     "paths": [
       ".dotnet",
       "$host$"
@@ -8,7 +8,7 @@
     "errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
   },
   "tools": {
-    "dotnet": "11.0.100-rc.1.26406.108",
+    "dotnet": "11.0.100-rc.1.26409.102",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

From 2f06d6c06df5bfc0825437dd287b59b8d55f8d22 Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Tue, 11 Aug 2026 05:50:09 +0200
Subject: [PATCH 07/13] Remove Hosting

Fixes error NU1510: Warning As Error: PackageReference Microsoft.Extensions.Hosting will not be pruned. This package is automatically available and does not need to be referenced explicitly. Remove the PackageReference item.
---
 src/Components/Testing/testassets/TestApp/TestApp.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Components/Testing/testassets/TestApp/TestApp.csproj b/src/Components/Testing/testassets/TestApp/TestApp.csproj
index d85b57b952d5..159dcaff01b7 100644
--- a/src/Components/Testing/testassets/TestApp/TestApp.csproj
+++ b/src/Components/Testing/testassets/TestApp/TestApp.csproj
@@ -24,7 +24,6 @@
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
     <Reference Include="Microsoft.AspNetCore.StaticAssets" />
-    <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.JSInterop" />
   </ItemGroup>
 

From 53d2f83f8030afebfbf972664dab46e10597dd34 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 11 Aug 2026 10:01:15 +0000
Subject: [PATCH 08/13] Fix TryAddPackage child process MSBuild SDK resolution
 for new SDK

Co-authored-by: Youssef1313 <31348972+Youssef1313@users.noreply.github.com>
---
 .cache/deviceid                                  |  1 +
 .../src/Commands/BaseCommand.cs                  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 .cache/deviceid

diff --git a/.cache/deviceid b/.cache/deviceid
new file mode 100644
index 000000000000..a5921771d9a0
--- /dev/null
+++ b/.cache/deviceid
@@ -0,0 +1 @@
+97201c44-b1af-4302-a028-d948d9fe0fd1
\ No newline at end of file
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
index 007c287e29ba..e06e1b27753c 100644
--- a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
@@ -227,6 +227,22 @@ private async Task TryAddPackage(string packageId, string packageVersion, FileIn
             RedirectStandardOutput = true,
         };
 
+        // Ensure DOTNET_ROOT points to the same installation as the muxer so the
+        // child process can locate SDKs when the ambient DOTNET_ROOT differs (e.g.
+        // system dotnet vs. the repo-local .dotnet installation).
+        var dotnetRoot = Path.GetDirectoryName(muxer);
+        if (!string.IsNullOrEmpty(dotnetRoot))
+        {
+            startInfo.Environment["DOTNET_ROOT"] = dotnetRoot;
+        }
+
+        // Remove MSBuild environment variables inherited from the test runner that
+        // may have been constructed with missing path separators, causing the MSBuild
+        // SDK resolver to look in incorrect paths (e.g. "1.0.0Sdks" instead of "1.0.0/Sdks").
+        startInfo.Environment.Remove("MSBuildSDKsPath");
+        startInfo.Environment.Remove("MSBUILD_EXE_PATH");
+        startInfo.Environment.Remove("MSBuildExtensionsPath");
+
         using var process = Process.Start(startInfo);
 
         var timeout = 20;

From 76b3c16cbda5982bb76e3a66780cfc268eaa247e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 11 Aug 2026 15:29:08 +0000
Subject: [PATCH 09/13] Update BaseCommand.cs comment to remove incorrect NuGet
 7531 attribution

Co-authored-by: Youssef1313 <31348972+Youssef1313@users.noreply.github.com>
---
 .../Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
index e06e1b27753c..448db9ce49e3 100644
--- a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
@@ -236,9 +236,10 @@ private async Task TryAddPackage(string packageId, string packageVersion, FileIn
             startInfo.Environment["DOTNET_ROOT"] = dotnetRoot;
         }
 
-        // Remove MSBuild environment variables inherited from the test runner that
-        // may have been constructed with missing path separators, causing the MSBuild
-        // SDK resolver to look in incorrect paths (e.g. "1.0.0Sdks" instead of "1.0.0/Sdks").
+        // Remove MSBuild environment variables that may have been set by the parent process
+        // (e.g. test runner) and that point to SDK-specific paths that may differ from
+        // what the child process should use. Removing these allows the SDK resolver to
+        // discover the correct SDK paths relative to DOTNET_ROOT.
         startInfo.Environment.Remove("MSBuildSDKsPath");
         startInfo.Environment.Remove("MSBUILD_EXE_PATH");
         startInfo.Environment.Remove("MSBuildExtensionsPath");

From 496e72d89c8e456f83a4b531245d907962b3400e Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Tue, 11 Aug 2026 18:28:35 +0200
Subject: [PATCH 10/13] Cleanup

---
 .../src/Commands/BaseCommand.cs                 | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
index 448db9ce49e3..007c287e29ba 100644
--- a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
@@ -227,23 +227,6 @@ private async Task TryAddPackage(string packageId, string packageVersion, FileIn
             RedirectStandardOutput = true,
         };
 
-        // Ensure DOTNET_ROOT points to the same installation as the muxer so the
-        // child process can locate SDKs when the ambient DOTNET_ROOT differs (e.g.
-        // system dotnet vs. the repo-local .dotnet installation).
-        var dotnetRoot = Path.GetDirectoryName(muxer);
-        if (!string.IsNullOrEmpty(dotnetRoot))
-        {
-            startInfo.Environment["DOTNET_ROOT"] = dotnetRoot;
-        }
-
-        // Remove MSBuild environment variables that may have been set by the parent process
-        // (e.g. test runner) and that point to SDK-specific paths that may differ from
-        // what the child process should use. Removing these allows the SDK resolver to
-        // discover the correct SDK paths relative to DOTNET_ROOT.
-        startInfo.Environment.Remove("MSBuildSDKsPath");
-        startInfo.Environment.Remove("MSBUILD_EXE_PATH");
-        startInfo.Environment.Remove("MSBuildExtensionsPath");
-
         using var process = Process.Start(startInfo);
 
         var timeout = 20;

From bfd8e6f590092d053abd7885d00444e6c09f9027 Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Tue, 11 Aug 2026 18:28:49 +0200
Subject: [PATCH 11/13] Delete .cache/deviceid

---
 .cache/deviceid | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .cache/deviceid

diff --git a/.cache/deviceid b/.cache/deviceid
deleted file mode 100644
index a5921771d9a0..000000000000
--- a/.cache/deviceid
+++ /dev/null
@@ -1 +0,0 @@
-97201c44-b1af-4302-a028-d948d9fe0fd1
\ No newline at end of file

From 6a93bc0c560b05c710d9e47d99a58fd35e05c145 Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Wed, 12 Aug 2026 13:24:39 +0200
Subject: [PATCH 12/13] Update Microsoft.Build.Locator

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 62ab316dd708..663cb07863fa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -106,7 +106,7 @@
     <MicrosoftCodeAnalysisRazorVersion>6.0.0</MicrosoftCodeAnalysisRazorVersion>
     <!-- Partner teams -->
     <MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
-    <MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
+    <MicrosoftBuildLocatorVersion>1.11.2</MicrosoftBuildLocatorVersion>
     <!--
       Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK.
       This need to be pinned since they're used in 3.1 apps and need to be loadable in VS 2019.

From bb7ef0cce5d3a7d96020a2db8a287defbdb896f9 Mon Sep 17 00:00:00 2001
From: Youssef Fahmy <youssefvictor00@gmail.com>
Date: Thu, 13 Aug 2026 13:53:41 +0200
Subject: [PATCH 13/13] Update dotnet-microsoft.openapi.Tests.csproj

---
 .../test/dotnet-microsoft.openapi.Tests.csproj                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj b/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
index daa1189be0d8..ea38dd2b2528 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
+++ b/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
@@ -4,6 +4,7 @@
     <AssemblyName>Microsoft.DotNet.Open.Api.Tools.Tests</AssemblyName>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
     <TestGroupName>DotNetAddOpenAPIReferenceToolsTests</TestGroupName>
+    <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
   </PropertyGroup>
 
   <PropertyGroup>