From ad2a717aff6c888fa7cf96e9de01222c52bdf5ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Feb 2025 12:23:36 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.24 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.24 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e6dab90871..347f5d567b3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,74 +167,74 @@ https://github.com/dotnet/roslyn 6908aead3a8b313798c381d5e435e9e6068301a7 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 6c434d17d1f5184eb7c14cce4c341c7714455265 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 0127731c2e23..040f7b6240ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,18 +145,18 @@ - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 + 6.14.0-preview.1.24 From 69d8432ecb58abc93fa5a880bd27ea78245b7df8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Feb 2025 12:25:56 +0000 Subject: [PATCH 02/22] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.27 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.27 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bda73b7d601..681d7e528c56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,74 +167,74 @@ https://github.com/dotnet/roslyn 6908aead3a8b313798c381d5e435e9e6068301a7 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 - + https://github.com/nuget/nuget.client - 6c434d17d1f5184eb7c14cce4c341c7714455265 + 38f10f632d8d1ffca92ae9f7a0c9e10a92451973 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index df7192b205db..512a7be48bbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,18 +145,18 @@ - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 - 6.14.0-preview.1.24 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 + 6.14.0-preview.1.27 From 235b1809ebe023c1aa1c48de0673ffc6d4b096a5 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Sun, 9 Feb 2025 23:50:27 +0100 Subject: [PATCH 03/22] Removed nuget.client patch --- ...0001-use-the-documented-artifact-ext.patch | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch b/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch deleted file mode 100644 index 39081266220a..000000000000 --- a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 62c4b5f114850d39efdca3df3b9ee83cc0f424ff Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Tue, 21 Jan 2025 16:16:49 -0800 -Subject: [PATCH 1/2] Use the documented Artifact extension point to add - artifacts - -The Artifact extension point handles symbol packages automatically for source-build, and it automatically gets support for new features like Artifact Visibility (required for https://github.com/dotnet/sdk/pull/46063) -Backport: https://github.com/NuGet/NuGet.Client/pull/6233 ---- - eng/Publishing.props | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 38810c73428..1175200dd59 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -1,11 +1,6 @@ - -- - -- -- <_SymbolsPackages Include="$(ArtifactsDir)nupkgs/*.symbols.nupkg" /> -- -+ - -- -- -\ No newline at end of file -+ - -From 9072cb03cb5c2958df318f59389547caa5de2c8a Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Wed, 22 Jan 2025 10:07:47 -0800 -Subject: [PATCH 2/2] Formatting and PR feedback - ---- - eng/Publishing.props | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 1175200dd59..41f498d4d4a 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -1,6 +1,8 @@ -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ From 007e15a7ad7f13c7b19622c96b0f982300269474 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 09:41:36 +0100 Subject: [PATCH 04/22] Fix CRLF (cherry picked from commit eb823bb3ac100d85fdc7a193e7ddb8cd4a9ec67e) --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 2f46e347155a..020c8aaad53a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -67,3 +67,5 @@ *.verified.txt text eol=lf working-tree-encoding=UTF-8 *.verified.xml text eol=lf working-tree-encoding=UTF-8 *.verified.json text eol=lf working-tree-encoding=UTF-8 + +src/SourceBuild/patches/**/*.patch text eol=lf From b62362e230de1c89d42be9ff3efb7aa7cdff9d05 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 28 Jan 2025 19:08:56 -0500 Subject: [PATCH 05/22] Fix tests now that package pruning is enabled by default (cherry picked from commit 10e515db2cc4d5c665ba1f421b7c65052e5aa961) --- .../FrameworkPackages/FrameworkPackages.cs | 5 ----- .../GivenThatWeWantToResolveConflicts.cs | 4 ++++ ...hatWeWantToStoreAProjectWithDependencies.cs | 18 ------------------ .../GivenDotnetListPackage.cs | 4 ++++ 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs b/src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs index 558ea870e41c..7cad5e407067 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs @@ -77,11 +77,6 @@ public static FrameworkPackages[] GetFrameworkPackages(NuGetFramework framework, { var frameworkPackages = new List(); - if (frameworkReferences.Length == 0) - { - frameworkReferences = [DefaultFrameworkKey]; - } - foreach (var frameworkReference in frameworkReferences) { var frameworkKey = GetFrameworkKey(frameworkReference); diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs index e1bc0efcb098..ba3e1703ae9d 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs @@ -116,6 +116,10 @@ public void CompileConflictsAreNotRemovedFromRuntimeDepsAssets() testProject.PackageReferences.Add(new TestPackageReference("Microsoft.AspNetCore.Mvc.Razor", "2.1.0")); + // This test relies on a package that would be pruned. This doesn't seem to be a customer scenario, it looks like it was + // an easier way to test that files that were removed + testProject.AdditionalProperties["RestoreEnablePackagePruning"] = "false"; + var testAsset = _testAssetsManager.CreateTestProject(testProject); var buildCommand = new BuildCommand(testAsset); diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index 036cc21f146a..52740045748f 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -78,12 +78,6 @@ public void compose_dependencies() "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll" }; - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store - files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}"); - } - storeDirectory.Should().OnlyHaveFiles(files_on_disk); } @@ -114,12 +108,6 @@ public void compose_dependencies_noopt() "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll" }; - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store - files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}"); - } - storeDirectory.Should().OnlyHaveFiles(files_on_disk); } @@ -157,12 +145,6 @@ public void compose_multifile() "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll", }; - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store - files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}"); - } - storeDirectory.Should().OnlyHaveFiles(files_on_disk); var knownpackage = new HashSet diff --git a/test/dotnet-list-package.Tests/GivenDotnetListPackage.cs b/test/dotnet-list-package.Tests/GivenDotnetListPackage.cs index 025dcb71a9c2..4a624a23e706 100644 --- a/test/dotnet-list-package.Tests/GivenDotnetListPackage.cs +++ b/test/dotnet-list-package.Tests/GivenDotnetListPackage.cs @@ -179,6 +179,10 @@ public static void Main(string[] args) }; testProject.PackageReferences.Add(new TestPackageReference("NewtonSoft.Json", "9.0.1")); + + // Disable package pruning so that there are still transitive dependencies to test the command + testProject.AdditionalProperties["RestoreEnablePackagePruning"] = "false"; + var testAsset = _testAssetsManager.CreateTestProject(testProject); var projectDirectory = Path.Combine(testAsset.Path, testProject.Name); From 82becc8c864ff2998aa7320d4f2b3d3c3471997b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 28 Jan 2025 21:50:46 -0500 Subject: [PATCH 06/22] Revert removal of workaround Probably the change to not prune packages if there are no FrameworkReferences reverted this to the old behavior (cherry picked from commit d99238617c6c1432d968c2c4c623f5f8c9c15ff2) --- ...hatWeWantToStoreAProjectWithDependencies.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs index 52740045748f..036cc21f146a 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs @@ -78,6 +78,12 @@ public void compose_dependencies() "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll" }; + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store + files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}"); + } + storeDirectory.Should().OnlyHaveFiles(files_on_disk); } @@ -108,6 +114,12 @@ public void compose_dependencies_noopt() "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll" }; + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store + files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}"); + } + storeDirectory.Should().OnlyHaveFiles(files_on_disk); } @@ -145,6 +157,12 @@ public void compose_multifile() "fluentassertions.json/4.12.0/lib/netstandard1.3/FluentAssertions.Json.dll", }; + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + // https://github.com/dotnet/core-setup/issues/2716 - an unintended native shim is getting published to the runtime store + files_on_disk.Add($"runtime.{_runtimeRid}.runtime.native.system.security.cryptography/1.0.1/runtimes/{_runtimeRid}/native/System.Security.Cryptography.Native{FileConstants.DynamicLibSuffix}"); + } + storeDirectory.Should().OnlyHaveFiles(files_on_disk); var knownpackage = new HashSet From 23657f7bc73afa6f2e1134afe0876010d5a465dd Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:25:23 -0800 Subject: [PATCH 07/22] Add NU1510 to NoWarn property (cherry picked from commit 8dba8b48ee77314e70403f62cffa3c7c907acf73) --- src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 68d0d163e1a3..9e294b247605 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -67,7 +67,7 @@ ]]> - %24(NoWarn);NU1903;$(RepoNoWarns) + %24(NoWarn);NU1903;NU1510;$(RepoNoWarns) ]]> From ee52c90d0244c028620df3f2eaa8c401d727c524 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 7 Feb 2025 16:23:24 +0100 Subject: [PATCH 08/22] Add NU1511 to NoWarn property (cherry picked from commit ecf5fcc71ee9c2db9dc8c0289c91b35dc4206cf2) --- src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 9e294b247605..3c3464868c75 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -67,7 +67,7 @@ ]]> - %24(NoWarn);NU1903;NU1510;$(RepoNoWarns) + %24(NoWarn);NU1903;NU1510;NU1511;$(RepoNoWarns) ]]> From 24e0bfb38fea3a0b927d7b362cb833526337c6cc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 12:41:46 +0100 Subject: [PATCH 09/22] Revert "Add NU1511 to NoWarn property" This reverts commit ee52c90d0244c028620df3f2eaa8c401d727c524. --- src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 3c3464868c75..9e294b247605 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -67,7 +67,7 @@ ]]> - %24(NoWarn);NU1903;NU1510;NU1511;$(RepoNoWarns) + %24(NoWarn);NU1903;NU1510;$(RepoNoWarns) ]]> From 77926a14e786e80a97c858c7d6b4c0c5efa76a40 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 12:42:07 +0100 Subject: [PATCH 10/22] Revert "Add NU1510 to NoWarn property" This reverts commit 23657f7bc73afa6f2e1134afe0876010d5a465dd. --- src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 9e294b247605..68d0d163e1a3 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -67,7 +67,7 @@ ]]> - %24(NoWarn);NU1903;NU1510;$(RepoNoWarns) + %24(NoWarn);NU1903;$(RepoNoWarns) ]]> From 4d6db1d5f1bb72cd463c729513f68aeabe3847de Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 15:22:59 +0100 Subject: [PATCH 11/22] Add patches --- ...ct-to-NuGet-package-pruning-warnings.patch | 52 ++++++++++++ ...ct-to-NuGet-package-pruning-warnings.patch | 51 ++++++++++++ ...ct-to-NuGet-package-pruning-warnings.patch | 80 +++++++++++++++++++ ...ct-to-NuGet-package-pruning-warnings.patch | 74 +++++++++++++++++ ...oWarn-NuGet-package-pruning-warnings.patch | 25 ++++++ ...ct-to-NuGet-package-pruning-warnings.patch | 46 +++++++++++ 6 files changed, 328 insertions(+) create mode 100644 src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch create mode 100644 src/SourceBuild/patches/fsharp/0002-React-to-NuGet-package-pruning-warnings.patch create mode 100644 src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch create mode 100644 src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch create mode 100644 src/SourceBuild/patches/source-build-reference-packages/0001-NoWarn-NuGet-package-pruning-warnings.patch create mode 100644 src/SourceBuild/patches/vstest/0001-React-to-NuGet-package-pruning-warnings.patch 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..7cf44897bb00 --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,52 @@ +From 2f580edd82d872d165b86b07ee0eeb073cb49acd Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 15:06:49 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/aspnetcore/pull/60297 + +--- + .../Server/src/Microsoft.AspNetCore.Components.Server.csproj | 2 +- + src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj | 2 +- + src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +index f690416b2b..92bd983063 100644 +--- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj ++++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +@@ -22,7 +22,7 @@ + + + +- ++ + + + +diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj +index b670eccaa5..3a9a992b5a 100644 +--- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj ++++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj +@@ -28,7 +28,7 @@ + + + +- ++ + + + +diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj +index b2ca66d8f7..b9b1b99952 100644 +--- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj ++++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj +@@ -29,7 +29,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/patches/fsharp/0002-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/fsharp/0002-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..55a24217e6a0 --- /dev/null +++ b/src/SourceBuild/patches/fsharp/0002-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,51 @@ +From 33ac19502896addb6693d606ca6e7351ec6610ec Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 15:00:47 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/fsharp/pull/18304 + +--- + eng/Versions.props | 1 - + src/fsc/fsc.targets | 9 ++++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 3b36ad6a7..ce0f5f5ac 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -87,7 +87,6 @@ + $(SystemPackageVersionVersion) + 6.1.0 + $(SystemPackageVersionVersion) +- 4.5.0 + 1.6.0 + + 4.11.0-2.24264.2 +diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets +index 1c67ceb39..dc80ab5c4 100644 +--- a/src/fsc/fsc.targets ++++ b/src/fsc/fsc.targets +@@ -45,13 +45,16 @@ + + + ++ ++ ++ ++ ++ ++ + + + + +- +- +- + + + +-- +2.47.1.windows.2 + diff --git a/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..f996165f1cf1 --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,80 @@ +From 4457db44e5129e7777abb1ad2262d60fab8d0a9b Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 15:04:23 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/NuGet/NuGet.Client/pull/6261 + +--- + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 2 +- + src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 2 +- + .../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 2 +- + src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 2 +- + src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +index 75ed5accd..c1815cb84 100644 +--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj ++++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj +@@ -27,7 +27,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj +index c20604eb9..21db96e44 100644 +--- a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj ++++ b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj +@@ -17,7 +17,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +index fd1bd0cd7..9111aac80 100644 +--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj ++++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +@@ -22,7 +22,7 @@ + + + +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj +index 1a140570e..df0f64c7d 100644 +--- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj ++++ b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj +@@ -66,7 +66,7 @@ + This package is a dependency of System.Security.Cryptography.Pkcs + When it is upgraded to a newer version, try deleting the below PackageReference + --> +- ++ + + + +diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj +index bec334cd4..43308010a 100644 +--- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj ++++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj +@@ -20,7 +20,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..bfe9fd8a4b21 --- /dev/null +++ b/src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,74 @@ +From 175dac7a1911085eda6da7b3c4d4dca054ba8021 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 15:09:54 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/sdk/pull/46689 + +--- + src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 1 - + .../Microsoft.NET.Build.Containers.csproj | 2 +- + src/Layout/redist/redist.csproj | 1 - + .../Microsoft.NET.Build.Tasks.csproj | 5 +++-- + 4 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +index b1b69a480a..9cfbf47181 100644 +--- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj ++++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +@@ -30,7 +30,6 @@ + + + +- + + + +diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj +index 68bdc29cb9..c6aaaf98c2 100644 +--- a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj ++++ b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj +@@ -44,7 +44,7 @@ + + runtime + +- ++ + + $(SystemTextJsonToolsetPackageVersion) +diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj +index a241ed598f..ceab916eb0 100644 +--- a/src/Layout/redist/redist.csproj ++++ b/src/Layout/redist/redist.csproj +@@ -47,7 +47,6 @@ + + + +- + + + +diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +index 4ae83a699e..44d6dfafa1 100644 +--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj ++++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +@@ -58,8 +58,6 @@ + + + +- +- + + + +@@ -75,6 +73,9 @@ + + + ++ ++ ++ + + $(NoWarn);RS1026 ++ ++ ++ $(NoWarn);NU1510;NU1511 + + + diff --git a/src/SourceBuild/patches/vstest/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/vstest/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..71df20d7b61f --- /dev/null +++ b/src/SourceBuild/patches/vstest/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,46 @@ +From 2783ecf7488da808c853b6be4f3a741cfafc7869 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 14:57:53 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/microsoft/vstest/pull/15008 + +--- + .../Microsoft.TestPlatform.CoreUtilities.csproj | 7 ++----- + .../Microsoft.TestPlatform.ObjectModel.csproj | 5 ++--- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +index 919bb26e7..866225a77 100644 +--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj ++++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +@@ -17,11 +17,8 @@ + + + +- +- +- +- +- ++ ++ + + + +diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +index 034807a58..1675d4cb0 100644 +--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj ++++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +@@ -35,9 +35,8 @@ + + + +- ++ Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net48')) != 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework'" /> ++ + + + From 31418b672d2bfae14a3bc8296c54ca41a0d01b41 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 15:28:30 +0100 Subject: [PATCH 12/22] Add missing patch for razor --- ...ct-to-NuGet-package-pruning-warnings.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..b8c844d9414c --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,24 @@ +From 287f933c0f361fb128b634c6a0315b1042fb8a8c Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 15:26:10 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/razor/pull/11471 + +--- + .../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +index 8c00b4d35f..73431d922b 100644 +--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj ++++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +@@ -13,7 +13,7 @@ + + + +- ++ + + + From 50a7914c5945be479421c48bdd88400808a110ab Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 16:48:13 +0100 Subject: [PATCH 13/22] Update nuget.nuget-client patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch index f996165f1cf1..fc8ee9c9e50a 100644 --- a/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch +++ b/src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch @@ -1,4 +1,4 @@ -From 4457db44e5129e7777abb1ad2262d60fab8d0a9b Mon Sep 17 00:00:00 2001 +From 61efe20e89726378bdf14443443f0c2da45c053d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 15:04:23 +0100 Subject: [PATCH] React to NuGet package pruning warnings @@ -6,12 +6,12 @@ Subject: [PATCH] React to NuGet package pruning warnings Backport: https://github.com/NuGet/NuGet.Client/pull/6261 --- - src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 2 +- - src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 2 +- - .../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 2 +- - src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 2 +- - src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 2 +- + src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 2 +- + .../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 3 ++- + src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 2 +- + src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 2 +- + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj index 75ed5accd..c1815cb84 100644 @@ -40,10 +40,10 @@ index c20604eb9..21db96e44 100644 diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index fd1bd0cd7..9111aac80 100644 +index fd1bd0cd7..d355f79d4 100644 --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -@@ -22,7 +22,7 @@ +@@ -22,12 +22,13 @@ @@ -52,6 +52,12 @@ index fd1bd0cd7..9111aac80 100644 + + ++ + + + diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj index 1a140570e..df0f64c7d 100644 --- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj From 35f0e14b7ea0788e17a44858282c670b3e54e654 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 18:46:48 +0100 Subject: [PATCH 14/22] Add runtime patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..f11eecdde934 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,143 @@ +From 548ed9c156c1088290a6b61f8f041ad39e884fd0 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 18:40:38 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/runtime/pull/112357 + +--- + .../Microsoft.Extensions.Diagnostics.Abstractions.csproj | 7 ++++++- + .../ref/Microsoft.Extensions.Logging.Abstractions.csproj | 5 +++++ + .../ref/Microsoft.Extensions.Logging.Console.csproj | 5 ++++- + .../System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj | 4 +++- + .../System.Memory.Data/ref/System.Memory.Data.csproj | 2 +- + .../System.Net.Http.Json/ref/System.Net.Http.Json.csproj | 8 ++++---- + 6 files changed, 23 insertions(+), 8 deletions(-) + +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 ++++ b/src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/ref/Microsoft.Extensions.Diagnostics.Abstractions.csproj +@@ -1,4 +1,5 @@ + ++ + + $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + +@@ -13,7 +14,11 @@ + + + +- + + ++ ++ ++ ++ ++ + +diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +index ff6d90a86e9..9d4c9f5ccf4 100644 +--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj ++++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +@@ -1,4 +1,5 @@ + ++ + + $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + +@@ -9,6 +10,10 @@ + + + ++ ++ ++ + + ++ + +diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +index 537f64f4fe4..92847d16a4f 100644 +--- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj ++++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +@@ -18,11 +18,14 @@ + + + +- + + + + + + ++ ++ ++ ++ + +diff --git a/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj b/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj +index 092064146e4..1fcac9238bc 100644 +--- a/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj ++++ b/src/libraries/System.Formats.Nrbf/ref/System.Formats.Nrbf.csproj +@@ -1,4 +1,5 @@ + ++ + + $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) + false +@@ -8,7 +9,7 @@ + + + +- ++ + + + +@@ -21,4 +22,5 @@ + + + ++ + +diff --git a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj +index 7d9b3481ecd..5f4d300cdab 100644 +--- a/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj ++++ b/src/libraries/System.Memory.Data/ref/System.Memory.Data.csproj +@@ -13,7 +13,7 @@ + + + +- ++ + + + +diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +index 6b6cd6ec4cb..f70e88607df 100644 +--- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj ++++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +@@ -17,16 +17,16 @@ + + + +- +- +- +- + + + + + + ++ ++ ++ ++ + + + From 363fb6cdeab1e95609ed082390dcaa8c39e083af Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 19:46:19 +0100 Subject: [PATCH 15/22] Delete src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 74 ------------------- 1 file changed, 74 deletions(-) delete mode 100644 src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch deleted file mode 100644 index bfe9fd8a4b21..000000000000 --- a/src/SourceBuild/patches/sdk/0001-React-to-NuGet-package-pruning-warnings.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 175dac7a1911085eda6da7b3c4d4dca054ba8021 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Mon, 10 Feb 2025 15:09:54 +0100 -Subject: [PATCH] React to NuGet package pruning warnings - -Backport: https://github.com/dotnet/sdk/pull/46689 - ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 1 - - .../Microsoft.NET.Build.Containers.csproj | 2 +- - src/Layout/redist/redist.csproj | 1 - - .../Microsoft.NET.Build.Tasks.csproj | 5 +++-- - 4 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index b1b69a480a..9cfbf47181 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -30,7 +30,6 @@ - - - -- - - - -diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj -index 68bdc29cb9..c6aaaf98c2 100644 ---- a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj -+++ b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj -@@ -44,7 +44,7 @@ - - runtime - -- -+ - - $(SystemTextJsonToolsetPackageVersion) -diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj -index a241ed598f..ceab916eb0 100644 ---- a/src/Layout/redist/redist.csproj -+++ b/src/Layout/redist/redist.csproj -@@ -47,7 +47,6 @@ - - - -- - - - -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index 4ae83a699e..44d6dfafa1 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -58,8 +58,6 @@ - - - -- -- - - - -@@ -75,6 +73,9 @@ - - - -+ -+ -+ - +- true +- +- true +- $(ApiCompatNetCoreAppBaselineVersion) +- +- $(BeforePack);IncludeAnalyzersInPackage;AddNETStandardCompatErrorFileForPackaging +- $(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludeProjectReferencesWithPackAttributeInPackage +- +- false +- true +- +- true +- $(MSBuildThisFileDirectory)useSharedDesignerContext.txt +- +- +- true +- PACKAGE.md +- PACKAGE.md +- $(BeforePack);ValidatePackageReadmeExists +- +- +- true +- true +- +- +- false +- +- +- +- +- true +- +- $(NoWarn);CP0003 +- +- +- +- +- +- +- +- +- <_FrameworkAssemblyReferences Include="$(MSBuildProjectName)" +- TargetFramework="$(NetFrameworkMinimum)" /> +- +- +- +- +- +- +- +- +- +- +- +- $(NoWarn);NU5128 +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- $(TargetDir)$(TargetName).pdb +- <_packageTargetRuntime>$(TargetPlatformIdentifier.ToLowerInvariant().Replace('windows', 'win')) +- <_targetFrameworkWithoutSuffix>$(TargetFramework) +- <_targetFrameworkWithoutSuffix Condition="$(TargetFramework.Contains('-'))">$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-')))) +- +- +- +- +- +- +- <_RuntimeSymbolPath Include="@(TfmRuntimeSpecificPackageFile->'%(RootDir)%(Directory)%(FileName).pdb')" Condition="'%(TfmRuntimeSpecificPackageFile.Extension)' == '.dll'" KeepMetadata="None" /> +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_TargetPathsToSymbols Include="@(_AnalyzerFile)" TargetPath="/%(_AnalyzerFile.PackagePath)" Condition="%(_AnalyzerFile.IsSymbol)" /> +- +- +- +- +- <_MultiTargetRoslynComponentTargetsTemplate>$(MSBuildThisFileDirectory)MultiTargetRoslynComponent.targets.template +- $(IntermediateOutputPath)MultiTargetRoslynComponent.targets +- true +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_MultiTargetRoslynComponentTargetPrefix>$(PackageId.Replace('.', '_')) +- Disable$(PackageId.Replace('.', ''))SourceGenerator +- +- +- +- +- +- +- +- +- <_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterror_%(NETStandardCompatError.Identity).targets +- <_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_')) +- <_NETStandardCompatErrorFileContent> +- +- +- +- +-]]> +- +- <_NETStandardCompatErrorPlaceholderFilePackagePath>buildTransitive$([System.IO.Path]::DirectorySeparatorChar)%(NETStandardCompatError.Supported) +- +- +- +- +- +- <_PackageBuildFile Include="@(None->Metadata('PackagePath')); +- @(Content->Metadata('PackagePath'))" /> +- <_PackageBuildFile PackagePathWithoutFilename="$([System.IO.Path]::GetDirectoryName('%(Identity)'))" /> +- +- +- +- +- +- +- +- +- +- <_referringTargetFramework>$(TargetFramework) +- <_referringTargetFramework Condition="'$(PackageUsePlatformTargeting)' != 'true' and $(TargetFramework.Contains('-'))">$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-')))) +- +- +- +- +- <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" /> +- +- +- +- +- +- +- +- +- +- +- <_referenceAssemblyPaths Include="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.dll')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true')->Metadata('ReferenceAssembly'))" /> +- <_referenceAssemblyPaths Include="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.xml')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true'))" /> +- +- +- +- +- +- +- +- net +- netframework +- +- +- +- +- +- +- <_BuildOutputPackageFile Include="$(OutputPath)**" +- Exclude="$(OutputPath)publish\**; +- $(OutputPath)" /> +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ true ++ ++ true ++ $(ApiCompatNetCoreAppBaselineVersion) ++ ++ $(BeforePack);IncludeAnalyzersInPackage;AddNETStandardCompatErrorFileForPackaging ++ $(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludeProjectReferencesWithPackAttributeInPackage ++ ++ false ++ true ++ ++ true ++ $(MSBuildThisFileDirectory)useSharedDesignerContext.txt ++ ++ ++ true ++ PACKAGE.md ++ PACKAGE.md ++ $(BeforePack);ValidatePackageReadmeExists ++ ++ ++ true ++ true ++ ++ ++ false ++ ++ ++ ++ ++ true ++ ++ $(NoWarn);CP0003 ++ ++ ++ ++ ++ ++ ++ ++ ++ <_FrameworkAssemblyReferences Include="$(MSBuildProjectName)" ++ TargetFramework="$(NetFrameworkMinimum)" /> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ $(NoWarn);NU5128 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ $(TargetDir)$(TargetName).pdb ++ <_packageTargetRuntime>$(TargetPlatformIdentifier.ToLowerInvariant().Replace('windows', 'win')) ++ <_targetFrameworkWithoutSuffix>$(TargetFramework) ++ <_targetFrameworkWithoutSuffix Condition="$(TargetFramework.Contains('-'))">$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-')))) ++ ++ ++ ++ ++ ++ ++ <_RuntimeSymbolPath Include="@(TfmRuntimeSpecificPackageFile->'%(RootDir)%(Directory)%(FileName).pdb')" Condition="'%(TfmRuntimeSpecificPackageFile.Extension)' == '.dll'" KeepMetadata="None" /> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_TargetPathsToSymbols Include="@(_AnalyzerFile)" TargetPath="/%(_AnalyzerFile.PackagePath)" Condition="%(_AnalyzerFile.IsSymbol)" /> ++ ++ ++ ++ ++ <_MultiTargetRoslynComponentTargetsTemplate>$(MSBuildThisFileDirectory)MultiTargetRoslynComponent.targets.template ++ $(IntermediateOutputPath)MultiTargetRoslynComponent.targets ++ true ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_MultiTargetRoslynComponentTargetPrefix>$(PackageId.Replace('.', '_')) ++ Disable$(PackageId.Replace('.', ''))SourceGenerator ++ ++ ++ ++ ++ ++ ++ ++ ++ <_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterror_%(NETStandardCompatError.Identity).targets ++ <_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_')) ++ <_NETStandardCompatErrorFileContent> ++ ++ ++ ++ ++]]> ++ ++ <_NETStandardCompatErrorPlaceholderFilePackagePath>buildTransitive$([System.IO.Path]::DirectorySeparatorChar)%(NETStandardCompatError.Supported) ++ ++ ++ ++ ++ ++ <_PackageBuildFile Include="@(None->Metadata('PackagePath')); ++ @(Content->Metadata('PackagePath'))" /> ++ <_PackageBuildFile PackagePathWithoutFilename="$([System.IO.Path]::GetDirectoryName('%(Identity)'))" /> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_referringTargetFramework>$(TargetFramework) ++ <_referringTargetFramework Condition="'$(PackageUsePlatformTargeting)' != 'true' and $(TargetFramework.Contains('-'))">$(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-')))) ++ ++ ++ ++ ++ <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" /> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_referenceAssemblyPaths Include="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.dll')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true')->Metadata('ReferenceAssembly'))" /> ++ <_referenceAssemblyPaths Include="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.xml')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true'))" /> ++ ++ ++ ++ ++ ++ ++ ++ net ++ netframework ++ ++ ++ ++ ++ ++ ++ <_BuildOutputPackageFile Include="$(OutputPath)**" ++ Exclude="$(OutputPath)publish\**; ++ $(OutputPath)" /> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 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 @@ -116,28 +724,3 @@ index 7d9b3481ecd..5f4d300cdab 100644 -diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj -index 6b6cd6ec4cb..f70e88607df 100644 ---- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj -+++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj -@@ -17,16 +17,16 @@ - - - -- -- -- -- - - - - - - -+ -+ -+ -+ - - - From 5cd497b2d0f64e1918e8f496e335b9b414008f3d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 22:52:05 +0100 Subject: [PATCH 17/22] Aktualisieren von 0002-React-to-NuGet-package-pruning-warnings.patch --- .../runtime/0002-React-to-NuGet-package-pruning-warnings.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch index b9a5b9115d4b..b59401d641eb 100644 --- a/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch +++ b/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch @@ -681,7 +681,7 @@ index 537f64f4fe4..92847d16a4f 100644 -+ ++ + + + From 39a64f6708c1256e747bd7b285faf47b91de31ee Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Feb 2025 09:12:37 +0100 Subject: [PATCH 18/22] Update runtime patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch index b59401d641eb..a0ebe588d2da 100644 --- a/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch +++ b/src/SourceBuild/patches/runtime/0002-React-to-NuGet-package-pruning-warnings.patch @@ -1,9 +1,9 @@ -From 1babdc04211e9a0e964fdefcedeb009903c1c690 Mon Sep 17 00:00:00 2001 +From 66fb701949fa9d79664e80d383c0385c2a823a85 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 10 Feb 2025 18:40:38 +0100 Subject: [PATCH] React to NuGet package pruning warnings -Backport: https://github.com/dotnet/runtime/pull/112357 +Backport: https://github.com/dotnet/runtime/pull/112357 --- eng/packaging.targets | 603 +++++++++--------- @@ -12,7 +12,8 @@ Backport: https://github.com/dotnet/runtime/pull/112357 ...icrosoft.Extensions.Logging.Console.csproj | 5 +- .../ref/System.Formats.Nrbf.csproj | 4 +- .../ref/System.Memory.Data.csproj | 2 +- - 6 files changed, 313 insertions(+), 313 deletions(-) + .../System.Security.Cryptography.Pkcs.csproj | 2 +- + 7 files changed, 314 insertions(+), 314 deletions(-) diff --git a/eng/packaging.targets b/eng/packaging.targets index c64ccfb2fcc..e03c40614b4 100644 @@ -667,7 +668,7 @@ index ff6d90a86e9..9d4c9f5ccf4 100644 + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj -index 537f64f4fe4..92847d16a4f 100644 +index 537f64f4fe4..f0353dbde22 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -18,11 +18,14 @@ @@ -724,3 +725,16 @@ index 7d9b3481ecd..5f4d300cdab 100644 +diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +index 168ec510fd0..de6981cf994 100644 +--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj ++++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +@@ -675,7 +675,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms + + + +- ++ + + + From 98d3e9db7a6f3e7ee249ed5a32188cf063769a22 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Feb 2025 11:54:45 +0100 Subject: [PATCH 19/22] Remove aspnetcore patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch 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 deleted file mode 100644 index 7cf44897bb00..000000000000 --- a/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2f580edd82d872d165b86b07ee0eeb073cb49acd Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Mon, 10 Feb 2025 15:06:49 +0100 -Subject: [PATCH] React to NuGet package pruning warnings - -Backport: https://github.com/dotnet/aspnetcore/pull/60297 - ---- - .../Server/src/Microsoft.AspNetCore.Components.Server.csproj | 2 +- - src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj | 2 +- - src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj -index f690416b2b..92bd983063 100644 ---- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj -+++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj -@@ -22,7 +22,7 @@ - - - -- -+ - - - -diff --git a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj -index b670eccaa5..3a9a992b5a 100644 ---- a/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj -+++ b/src/Tools/dotnet-user-jwts/src/dotnet-user-jwts.csproj -@@ -28,7 +28,7 @@ - - - -- -+ - - - -diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj -index b2ca66d8f7..b9b1b99952 100644 ---- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj -+++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj -@@ -29,7 +29,7 @@ - - - -- -+ - - - From 192fc4ec191f5be9cde31428c13d3b27222817ad Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Feb 2025 11:56:15 +0100 Subject: [PATCH 20/22] Remove razor patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch deleted file mode 100644 index b8c844d9414c..000000000000 --- a/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 287f933c0f361fb128b634c6a0315b1042fb8a8c Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Mon, 10 Feb 2025 15:26:10 +0100 -Subject: [PATCH] React to NuGet package pruning warnings - -Backport: https://github.com/dotnet/razor/pull/11471 - ---- - .../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj -index 8c00b4d35f..73431d922b 100644 ---- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj -+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj -@@ -13,7 +13,7 @@ - - - -- -+ - - - From 450790b90100baafa93292681679228761bb4f19 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Feb 2025 11:56:45 +0100 Subject: [PATCH 21/22] Remove SBRP patch --- ...oWarn-NuGet-package-pruning-warnings.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/SourceBuild/patches/source-build-reference-packages/0001-NoWarn-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/source-build-reference-packages/0001-NoWarn-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/source-build-reference-packages/0001-NoWarn-NuGet-package-pruning-warnings.patch deleted file mode 100644 index a465af89e593..000000000000 --- a/src/SourceBuild/patches/source-build-reference-packages/0001-NoWarn-NuGet-package-pruning-warnings.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7eeb1ab91a29ff3bb849a28adc3fd8919344f8d7 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Mon, 10 Feb 2025 14:54:25 +0100 -Subject: [PATCH] NoWarn NuGet package pruning warnings - -Backport: https://github.com/dotnet/source-build-reference-packages/pull/1153 ---- - src/referencePackages/Directory.Build.props | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/referencePackages/Directory.Build.props b/src/referencePackages/Directory.Build.props -index 4482751a..f3a6b737 100644 ---- a/src/referencePackages/Directory.Build.props -+++ b/src/referencePackages/Directory.Build.props -@@ -107,6 +107,10 @@ - $(NoWarn);RS1025 - - $(NoWarn);RS1026 -+ -+ -+ $(NoWarn);NU1510;NU1511 - - - From ab392b904374675de09c6dc844d8eb9ef4d42580 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 11 Feb 2025 11:59:10 +0100 Subject: [PATCH 22/22] Revert "Remove razor patch" This reverts commit 192fc4ec191f5be9cde31428c13d3b27222817ad. --- ...ct-to-NuGet-package-pruning-warnings.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch new file mode 100644 index 000000000000..b8c844d9414c --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch @@ -0,0 +1,24 @@ +From 287f933c0f361fb128b634c6a0315b1042fb8a8c Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Mon, 10 Feb 2025 15:26:10 +0100 +Subject: [PATCH] React to NuGet package pruning warnings + +Backport: https://github.com/dotnet/razor/pull/11471 + +--- + .../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +index 8c00b4d35f..73431d922b 100644 +--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj ++++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj +@@ -13,7 +13,7 @@ + + + +- ++ + + +