Re-Bootstrap Source Build to .NET 10.0.100-preview.2.25113.1

src/SourceBuild/content/eng/Version.Details.xml

@@ -2,9 +2,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25103.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25110.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0b971a5e11be58af22ca83fbc111a1207bb62920</Sha>
+      <Sha>c80f5199af3eb3ebf00ca30ec4fa3af93faf0439</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

src/SourceBuild/content/eng/Versions.props

@@ -23,8 +23,8 @@
       of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
       are not necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSdkVersion>10.0.100-preview.2.25105.1</PrivateSourceBuiltSdkVersion>
-    <PrivateSourceBuiltArtifactsVersion>10.0.100-preview.2.25105.1</PrivateSourceBuiltArtifactsVersion>
+    <PrivateSourceBuiltSdkVersion>10.0.100-preview.2.25113.1</PrivateSourceBuiltSdkVersion>
+    <PrivateSourceBuiltArtifactsVersion>10.0.100-preview.2.25113.1</PrivateSourceBuiltArtifactsVersion>
     <!-- command-line-api dependencies -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
     <!-- msbuild dependencies -->

src/SourceBuild/content/global.json

@@ -1,10 +1,10 @@
 {
   "tools": {
-    "dotnet": "10.0.100-preview.2.25104.28"
+    "dotnet": "10.0.100-preview.2.25112.53"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25103.6"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25110.3"
   }
 }

src/SourceBuild/patches/arcade/0001-React-to-NuGet-package-pruning-warnings.patch

@@ -0,0 +1,28 @@
+From 6c7d07924bdfdf7c17b89ff50f1574e76618c381 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Fri, 14 Feb 2025 13:31:06 +0100
+Subject: [PATCH] React to NuGet package pruning warnings
+
+Backport: https://github.com/dotnet/arcade/pull/15518
+
+---
+ .../Client/CSharp/Microsoft.DotNet.Helix.Client.csproj       | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj b/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj
+index 5204d4117..e0e56b3ae 100644
+--- a/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj
++++ b/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj
+@@ -14,8 +14,11 @@
+
+   <ItemGroup>
+     <PackageReference Include="Azure.Core" />
+-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+     <PackageReference Include="Newtonsoft.Json" />
++  </ItemGroup>
++
++  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
++    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+     <PackageReference Include="System.Collections.Immutable" />
+     <PackageReference Include="System.Text.Encodings.Web" />
+   </ItemGroup>

src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch

@@ -0,0 +1,150 @@
+From ccc70ac49e1fc406b488e2c5347c6933073b2c67 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Fri, 14 Feb 2025 16:11:41 +0100
+Subject: [PATCH] React to NuGet package pruning warnings
+
+Backport: https://github.com/dotnet/aspnetcore/pull/60395
+
+---
+ ...Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj | 1 -
+ ...icrosoft.AspNetCore.Components.WebAssembly.DevServer.csproj | 1 -
+ .../JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj        | 2 +-
+ .../src/Microsoft.Extensions.Logging.AzureAppServices.csproj   | 2 +-
+ .../Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj  | 3 ---
+ .../src/Microsoft.AspNetCore.SignalR.Client.Core.csproj        | 2 +-
+ src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj    | 2 +-
+ src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj    | 2 +-
+ .../src/Microsoft.dotnet-openapi.csproj                        | 2 --
+ src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj         | 2 --
+ 10 files changed, 5 insertions(+), 14 deletions(-)
+
+diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
+index fe1c0f19275e..dbc464028962 100644
+--- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
++++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
+@@ -13,7 +13,6 @@
+   <ItemGroup>
+     <Reference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" />
+     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+-    <Reference Include="System.Text.Json" />
+   </ItemGroup>
+
+   <ItemGroup>
+diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+index b24c6bd6ac9e..a320af38fa9c 100644
+--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
++++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+@@ -21,7 +21,6 @@
+   <ItemGroup>
+     <Reference Include="Microsoft.AspNetCore" />
+     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
+-    <Reference Include="System.Text.Json" />
+
+     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" IsImplicitlyDefined="true" AllowExplicitReference="true" />
+   </ItemGroup>
+diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
+index 57cc0737ff21..f4027ea5fd71 100644
+--- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
++++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
+@@ -22,7 +22,7 @@
+   </ItemGroup>
+
+   <ItemGroup>
+-    <Reference Include="Microsoft.CSharp" />
++    <Reference Include="Microsoft.CSharp" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+     <Reference Include="Newtonsoft.Json" />
+   </ItemGroup>
+
+diff --git a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
+index 8c75d85a4ff9..d3e91be03049 100644
+--- a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
++++ b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
+@@ -18,7 +18,7 @@
+     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+     <Reference Include="Microsoft.Extensions.Logging.Configuration" />
+     <Reference Include="Microsoft.Extensions.Logging" />
+-    <Reference Include="System.ValueTuple" />
++    <Reference Include="System.ValueTuple" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+   </ItemGroup>
+
+   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
+diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+index a3c025d7cb99..c6beee133ff7 100644
+--- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
++++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+@@ -70,9 +70,6 @@
+
+     <Reference Include="Microsoft.NETCore.Windows.ApiSets" />
+     <Reference Include="Microsoft.Web.Administration" />
+-    <Reference Include="System.Net.Http" />
+-    <Reference Include="System.Security.Cryptography.X509Certificates" />
+-    <Reference Include="System.Security.Principal.Windows" />
+     <Reference Include="System.ServiceProcess.ServiceController" />
+   </ItemGroup>
+
+diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
+index 16c662419d25..93470d863615 100644
+--- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
++++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
+@@ -33,7 +33,7 @@
+     <Reference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
+     <Reference Include="Microsoft.Extensions.DependencyInjection" />
+     <Reference Include="Microsoft.Extensions.Logging" />
+-    <Reference Include="System.Threading.Channels" />
++    <Reference Include="System.Threading.Channels" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+   </ItemGroup>
+
+   <ItemGroup Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'">
+diff --git a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj
+index b791c1e90861..179d80bbba73 100644
+--- a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj
++++ b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj
+@@ -28,7 +28,7 @@
+     <Reference Include="Microsoft.Extensions.Logging" />
+     <Reference Include="Serilog.Extensions.Logging" />
+     <Reference Include="Serilog.Sinks.File" />
+-    <Reference Include="System.ValueTuple" />
++    <Reference Include="System.ValueTuple" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+
+     <!--
+       This intentionally does not reference 'xunit', 'xunit.core', or any runner packages.
+diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
+index 4e2a913cc920..a5b5cd12beb8 100644
+--- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
++++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
+@@ -19,7 +19,7 @@
+     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
+   </ItemGroup>
+
+-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
++  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+     <Reference Include="System.Diagnostics.DiagnosticSource" />
+   </ItemGroup>
+
+diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
+index 3dda9082146e..8c9bcb4585b3 100644
+--- a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
++++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
+@@ -17,8 +17,6 @@
+   <ItemGroup>
+     <Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
+     <Reference Include="Microsoft.Build.Locator" />
+-    <Reference Include="System.Private.Uri" />
+-    <Reference Include="System.Text.Json" />
+   </ItemGroup>
+
+   <ItemGroup>
+diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
+index 8d0f2d89aad7..9ecfc17f9ef3 100644
+--- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
++++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
+@@ -16,9 +16,7 @@
+   <ItemGroup>
+     <Reference Include="Microsoft.Data.SqlClient" />
+     <Reference Include="Azure.Identity" />
+-    <Reference Include="System.Private.Uri" />
+     <Reference Include="System.Runtime.Caching" />
+-    <Reference Include="System.Text.Json" />
+   </ItemGroup>
+
+ </Project>

src/SourceBuild/patches/fsharp/0003-React-to-NuGet-package-pruning-warnings.patch

@@ -0,0 +1,24 @@
+From ad850b7a69110b29f1709f623bef8bdf8ccd8dd8 Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Fri, 14 Feb 2025 11:55:23 +0100
+Subject: [PATCH] Contributes to https://github.com/dotnet/sdk/pull/46829
+
+Backport: https://github.com/dotnet/fsharp/pull/18318
+
+---
+ src/Compiler/FSharp.Compiler.Service.fsproj | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
+index b345d6ed1..493248a11 100644
+--- a/src/Compiler/FSharp.Compiler.Service.fsproj
++++ b/src/Compiler/FSharp.Compiler.Service.fsproj
+@@ -597,7 +597,7 @@
+     <PackageReference Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersionValue)" />
+   </ItemGroup>
+
+-  <ItemGroup>
++  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+     <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
+     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />

src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch

@@ -0,0 +1,66 @@
+From 41fb2135ac3592704846efe6b8731f0d68e744df Mon Sep 17 00:00:00 2001
+From: Viktor Hofer <viktor.hofer@microsoft.com>
+Date: Fri, 14 Feb 2025 11:53:15 +0100
+Subject: [PATCH] React to NuGet package pruning warnings
+
+Backport: https://github.com/dotnet/razor/pull/11496
+
+---
+ ...oft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.csproj | 2 +-
+ ...oft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.csproj | 2 +-
+ .../Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj         | 2 +-
+ .../Microsoft.AspNetCore.Razor.Test.Common.csproj               | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.csproj b/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.csproj
+index bbdec08a718..d2882f3e6f3 100644
+--- a/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.csproj
++++ b/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.csproj
+@@ -5,7 +5,7 @@
+     <PreserveCompilationContext>true</PreserveCompilationContext>
+   </PropertyGroup>
+
+-  <ItemGroup>
++  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
+     <PackageReference Include="System.Text.Encodings.Web" />
+   </ItemGroup>
+diff --git a/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.csproj b/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.csproj
+index bbdec08a718..d2882f3e6f3 100644
+--- a/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.csproj
++++ b/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X/Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.csproj
+@@ -5,7 +5,7 @@
+     <PreserveCompilationContext>true</PreserveCompilationContext>
+   </PropertyGroup>
+
+-  <ItemGroup>
++  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
+     <PackageReference Include="System.Text.Encodings.Web" />
+   </ItemGroup>
+diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj
+index 3e1f302dc61..ff110ab5bd9 100644
+--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj
++++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj
+@@ -16,7 +16,7 @@
+     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
+     <PackageReference Include="MessagePack" />
+-    <PackageReference Include="System.Threading.Tasks.Extensions" />
++    <PackageReference Include="System.Threading.Tasks.Extensions" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+     <PackageReference Include="Microsoft.VisualStudio.Threading" />
+   </ItemGroup>
+
+diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+index 389e6c60fee..83a6f29dc8a 100644
+--- a/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
++++ b/src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+@@ -9,7 +9,7 @@
+
+   <ItemGroup>
+     <ProjectReference Include="..\..\Compiler\Microsoft.CodeAnalysis.Razor.Compiler\src\Microsoft.CodeAnalysis.Razor.Compiler.csproj" />
+-    <PackageReference Include="Microsoft.CSharp" />
++    <PackageReference Include="Microsoft.CSharp" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+     <PackageReference Include="Microsoft.CodeAnalysis.Common" />
+     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+     <PackageReference Include="Microsoft.CodeAnalysis.Test.Utilities" />