diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 52411253c623..7565cf09fb19 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 0b971a5e11be58af22ca83fbc111a1207bb62920 + c80f5199af3eb3ebf00ca30ec4fa3af93faf0439 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 0da82f9cd4a9..118cba7ae897 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/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. --> - 10.0.100-preview.2.25105.1 - 10.0.100-preview.2.25105.1 + 10.0.100-preview.2.25113.1 + 10.0.100-preview.2.25113.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index fa5eb069202d..92ef32fe0e1b 100644 --- a/src/SourceBuild/content/global.json +++ b/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" } } diff --git a/src/SourceBuild/patches/arcade/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/arcade/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..208c8a79a7c5 --- /dev/null +++ b/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 +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 @@ + + + +- + ++ ++ ++ ++ + + + diff --git a/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..8ef660fed8ce --- /dev/null +++ b/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 +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 @@ + + + +- + + + +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 @@ + + + +- + + + +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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + +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 @@ + + + +- +- +- + + + +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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + ahb ++ ++ $(NoWarn);NU1511 + + + +diff --git a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj +index 240237d8525..752922700de 100644 +--- a/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj ++++ b/src/installer/tests/HostActivation.Tests/HostActivation.Tests.csproj +@@ -6,6 +6,9 @@ + true + + ha ++ ++ $(NoWarn);NU1511 + + + +diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj +index 4e01fdc25bd..49ccc41646d 100644 +--- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj ++++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj +@@ -2,14 +2,14 @@ + + + $(TestInfraTargetFramework) +- + false ++ ++ $(NoWarn);NU1511 + + + + +- +- + + + +diff --git a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Tests.csproj b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Tests.csproj +index 053fe5b65fc..a2782a71cbb 100644 +--- a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Tests.csproj ++++ b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.Tests.csproj +@@ -6,6 +6,9 @@ + true + + hm ++ ++ $(NoWarn);NU1511 + + + +diff --git a/src/installer/tests/TestUtils/TestUtils.csproj b/src/installer/tests/TestUtils/TestUtils.csproj +index 268d4af5451..2db347c9361 100644 +--- a/src/installer/tests/TestUtils/TestUtils.csproj ++++ b/src/installer/tests/TestUtils/TestUtils.csproj +@@ -5,6 +5,9 @@ + true + TestUtils + TestUtils ++ ++ $(NoWarn);NU1511 + + + diff --git a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj index f7b93cc292f..63b868b9850 100644 --- a/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj @@ -738,3 +822,45 @@ index 168ec510fd0..de6981cf994 100644 +diff --git a/src/libraries/sfx-finish.proj b/src/libraries/sfx-finish.proj +index ed1f35bd31d..9f76ac74dcb 100644 +--- a/src/libraries/sfx-finish.proj ++++ b/src/libraries/sfx-finish.proj +@@ -7,11 +7,16 @@ + $(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml + + true ++ ++ $(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\PackageOverrides.txt ++ $(MicrosoftNetCoreAppRefPackDataDir)PackageOverrides.txt + + + + + ++ ++ + + + +@@ -51,6 +56,20 @@ + RootAttributes="@(FrameworkListRootAttribute)" /> + + ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/src/SourceBuild/patches/vstest/0002-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/vstest/0002-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..381edceffc1e --- /dev/null +++ b/src/SourceBuild/patches/vstest/0002-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,297 @@ +From 44702e10e4eedf55277fd9fa3d47ceae72f69deb Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Fri, 14 Feb 2025 13:05:31 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/microsoft/vstest/pull/15011 + +--- + eng/Versions.props | 2 -- + ...osoft.TestPlatform.AdapterUtilities.csproj | 6 ------ + .../Microsoft.TestPlatform.Portable.csproj | 19 +++++++++++-------- + src/testhost.arm64/testhost.arm64.csproj | 13 ++++++++----- + src/testhost.x86/testhost.x86.csproj | 12 +++++++----- + src/testhost/testhost.csproj | 13 ++++++++----- + .../SimpleClassLibrary.csproj | 6 ++++-- + 7 files changed, 38 insertions(+), 33 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index eb5534b82f..e88e8c7470 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -68,9 +68,7 @@ + 8.0.0 + 8.0.0 + 4.5.5 +- 4.3.4 + 8.0.0 +- 4.3.2 + 17.10.0-preview-2-34602-162 + 17.10.0-preview-2-34602-162 + 17.12.35519.223 +diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +index 9f62e98bb9..5d34ff1083 100644 +--- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj ++++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +@@ -27,12 +27,6 @@ + false + + +- +- +- +- +- +- + + + True +diff --git a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj +index 60aef566c6..353675add1 100644 +--- a/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj ++++ b/src/package/Microsoft.TestPlatform.Portable/Microsoft.TestPlatform.Portable.csproj +@@ -71,20 +71,23 @@ + + + ++ ++ ++ ++ + + +- + + + + +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj +index 07ea654d84..218480d5d7 100644 +--- a/src/testhost.arm64/testhost.arm64.csproj ++++ b/src/testhost.arm64/testhost.arm64.csproj +@@ -1,11 +1,13 @@ + + ++ + + + None + + $(MSBuildWarningsAsMessages);MSB3276 + ++ + + + +@@ -15,16 +17,19 @@ + false + app.manifest + ++ + + win10-arm64 + false + $(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64 + ++ + + + + + ++ + + + +@@ -35,12 +40,8 @@ + + true + +- +- +- +- +- + ++ + + + +@@ -48,11 +49,13 @@ + + + ++ + + + + + ++ + + + +diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj +index ebf12d08a8..50245b8159 100644 +--- a/src/testhost.x86/testhost.x86.csproj ++++ b/src/testhost.x86/testhost.x86.csproj +@@ -1,11 +1,13 @@ + + ++ + + + None + + $(MSBuildWarningsAsMessages);MSB3276 + ++ + + + +@@ -25,13 +27,16 @@ + NETSDK1201 + $(NoWarn);NETSDK1201 + ++ + + false + $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 + ++ + + + ++ + + + +@@ -42,12 +47,8 @@ + + true + +- +- +- +- +- + ++ + + + +@@ -55,6 +56,7 @@ + + + ++ + + + +diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj +index 5cb6999771..05f048d7a1 100644 +--- a/src/testhost/testhost.csproj ++++ b/src/testhost/testhost.csproj +@@ -1,11 +1,13 @@ + + ++ + + + None + + $(MSBuildWarningsAsMessages);MSB3276 + ++ + + + +@@ -15,16 +17,19 @@ + false + app.manifest + ++ + + win7-x64 + false + $(AssemblyName).$(TargetFramework) + ++ + + + + + ++ + + + +@@ -35,12 +40,8 @@ + + true + +- +- +- +- +- + ++ + + + +@@ -48,11 +49,13 @@ + + + ++ + + + + + ++ + + + +diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +index 1501208e37..ac382027ea 100644 +--- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj ++++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +@@ -1,10 +1,11 @@ + ++ + + $(NetFrameworkMinimum);$(NetCoreAppMinimum) + + +- +- ++ ++ + + + +@@ -19,4 +20,5 @@ + + portable + ++ + diff --git a/src/SourceBuild/patches/winforms/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/winforms/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..b3ce07c4e20b --- /dev/null +++ b/src/SourceBuild/patches/winforms/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,62 @@ +From 53e3e50488370a0640f0e46b3947bb1be1bd232d Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Fri, 14 Feb 2025 12:55:46 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/winforms/pull/12955 + +--- + .../src/System.Private.Windows.Core.csproj | 1 - + .../System.Private.Windows.GdiPlus.csproj | 1 - + .../src/System.Windows.Forms.Primitives.csproj | 1 - + src/System.Windows.Forms/src/System.Windows.Forms.csproj | 1 - + 4 files changed, 4 deletions(-) + +diff --git a/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj b/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj +index 48c1088456c..f46bbd1de3e 100644 +--- a/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj ++++ b/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj +@@ -30,7 +30,6 @@ + + + +- + + + +diff --git a/src/System.Private.Windows.GdiPlus/System.Private.Windows.GdiPlus.csproj b/src/System.Private.Windows.GdiPlus/System.Private.Windows.GdiPlus.csproj +index f795299ef64..f07575a1ae2 100644 +--- a/src/System.Private.Windows.GdiPlus/System.Private.Windows.GdiPlus.csproj ++++ b/src/System.Private.Windows.GdiPlus/System.Private.Windows.GdiPlus.csproj +@@ -32,7 +32,6 @@ + + + +- + + + +diff --git a/src/System.Windows.Forms.Primitives/src/System.Windows.Forms.Primitives.csproj b/src/System.Windows.Forms.Primitives/src/System.Windows.Forms.Primitives.csproj +index 027b42e8757..8ff20010026 100644 +--- a/src/System.Windows.Forms.Primitives/src/System.Windows.Forms.Primitives.csproj ++++ b/src/System.Windows.Forms.Primitives/src/System.Windows.Forms.Primitives.csproj +@@ -45,7 +45,6 @@ + + + +- + + + +diff --git a/src/System.Windows.Forms/src/System.Windows.Forms.csproj b/src/System.Windows.Forms/src/System.Windows.Forms.csproj +index 610aa60fc51..d9cd24b3165 100644 +--- a/src/System.Windows.Forms/src/System.Windows.Forms.csproj ++++ b/src/System.Windows.Forms/src/System.Windows.Forms.csproj +@@ -39,7 +39,6 @@ + + + +- + + +