From d4d04386775d08f9a63233944216fef4a38e8304 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jan 2025 12:20:47 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.14 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.14 --- 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 ff184ec9e69b..7083796db4b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d54398bab32d..929aa2d5c3a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,18 +146,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.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 From 10e515db2cc4d5c665ba1f421b7c65052e5aa961 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 28 Jan 2025 19:08:56 -0500 Subject: [PATCH 02/17] Fix tests now that package pruning is enabled by default --- .../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 d99238617c6c1432d968c2c4c623f5f8c9c15ff2 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 28 Jan 2025 21:50:46 -0500 Subject: [PATCH 03/17] Revert removal of workaround Probably the change to not prune packages if there are no FrameworkReferences reverted this to the old behavior --- ...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 e4d9f6a453824aee4f72ca250781b67e113ef1a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 12:20:12 +0000 Subject: [PATCH 04/17] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.15 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.15 --- 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 7083796db4b6..126086de0f85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 929aa2d5c3a6..c683471e63ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,18 +146,18 @@ - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 From 9e93af5b39535f690b7145c00c7c44b9ab257d31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 12:25:38 +0000 Subject: [PATCH 05/17] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.17 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.17 --- 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 126086de0f85..26b78fa5b391 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index c683471e63ca..9443cb3b3632 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,18 +146,18 @@ - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 From a304046213cc67588c0b6c6a1fa5bab78c7e9f11 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 31 Jan 2025 08:32:13 -0800 Subject: [PATCH 06/17] Remove the patch - changes are now present in nuget.client repo --- ...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 6f3081483cd0a51ce3c0d553cf5a5b7d2537974e Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 4 Feb 2025 11:24:22 +0100 Subject: [PATCH 07/17] Bump darc --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index c2a768886565..91e9458e9a3d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.25072.2", + "version": "1.1.0-beta.25081.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26b78fa5b391..153e6f79afde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -638,13 +638,13 @@ https://github.com/dotnet/runtime f196875c5d0441364f6538d2dd8fc4e3eb1ff108 - + https://github.com/dotnet/arcade-services - f1b6b9baa2a3e66a52496d3b3e1423b5fcb1906e + 0a9f6b177026a7473b9225355269c2c9a90b777f - + https://github.com/dotnet/arcade-services - f1b6b9baa2a3e66a52496d3b3e1423b5fcb1906e + 0a9f6b177026a7473b9225355269c2c9a90b777f https://github.com/dotnet/scenario-tests diff --git a/eng/Versions.props b/eng/Versions.props index 9443cb3b3632..4a5267309c5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -76,7 +76,7 @@ - 1.1.0-beta.25072.2 + 1.1.0-beta.25081.2 From 7ab4fa06eb911290e2815b9f3a4ee15beb1a0c60 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 4 Feb 2025 17:46:42 +0000 Subject: [PATCH 08/17] Patch for nuget.client 6251 --- ...xtra-spaces-in-Publishing.props-6251.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch diff --git a/src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch b/src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch new file mode 100644 index 000000000000..338f83d73ecb --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= +Date: Tue, 4 Feb 2025 18:10:48 +0100 +Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) + +This might help with the VMR sync problems we have in https://github.com/dotnet/sdk/pull/46361 +Backport: https://github.com/NuGet/NuGet.Client/pull/6251 +--- + eng/Publishing.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Publishing.props b/eng/Publishing.props +index d5604fbf8..5fe1ceb1a 100644 +--- a/eng/Publishing.props ++++ b/eng/Publishing.props +@@ -4,5 +4,5 @@ + + +- ++ + From 05ebd1166bfc72e7fbed619bff08e6023ef8341e Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 4 Feb 2025 22:20:37 +0000 Subject: [PATCH 09/17] Add a dummy patch to workaround the vmr-sync issue --- ...0001-use-the-documented-artifact-ext.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create 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 new file mode 100644 index 000000000000..7dc73a4d8ffc --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Tue, 4 Feb 2025 22:18:35 +0000 +Subject: [PATCH] use the documented artifact ext + +--- + eng/Publishing.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Publishing.props b/eng/Publishing.props +index 5fe1ceb1a..e8289fe7d 100644 +--- a/eng/Publishing.props ++++ b/eng/Publishing.props +@@ -1,4 +1,4 @@ +- ++ + + + Date: Wed, 5 Feb 2025 09:50:44 +0100 Subject: [PATCH 10/17] Try merging the patches --- ...xtra-spaces-in-Publishing.props-6251.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch diff --git a/src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch b/src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch deleted file mode 100644 index 338f83d73ecb..000000000000 --- a/src/SourceBuild/patches/nuget-client/0002-Remove-extra-spaces-in-Publishing.props-6251.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= -Date: Tue, 4 Feb 2025 18:10:48 +0100 -Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) - -This might help with the VMR sync problems we have in https://github.com/dotnet/sdk/pull/46361 -Backport: https://github.com/NuGet/NuGet.Client/pull/6251 ---- - eng/Publishing.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index d5604fbf8..5fe1ceb1a 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -4,5 +4,5 @@ - - -- -+ - From b751d4f4eba8ca17460e8be796e46c1f13b75daa Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 5 Feb 2025 12:52:57 +0100 Subject: [PATCH 11/17] Put the spaces somewhere else than EOL --- ...0001-use-the-documented-artifact-ext.patch | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 index 7dc73a4d8ffc..1c111d9eefe1 100644 --- 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 @@ -1,19 +1,24 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 4 Feb 2025 22:18:35 +0000 -Subject: [PATCH] use the documented artifact ext +Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) --- - eng/Publishing.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + eng/Publishing.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props -index 5fe1ceb1a..e8289fe7d 100644 +index d5604fbf8..7517ca4e5 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props -@@ -1,4 +1,4 @@ -- -+ +@@ -2,7 +2,7 @@ ++ PublishFlatContainer="false" /> + +- + +-- +2.47.1.windows.2 From 131463183100a0e481c2e7349d136461b4adad58 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 5 Feb 2025 16:05:40 +0100 Subject: [PATCH 12/17] Fix the patch --- .../0001-use-the-documented-artifact-ext.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 index 1c111d9eefe1..bcaef666bad3 100644 --- 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 @@ -1,17 +1,18 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Tue, 4 Feb 2025 22:18:35 +0000 +From: Premek Vysoky +Date: Wed, 5 Feb 2025 12:51:35 +0100 Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) +This might help with the VMR sync problems we have in https://github.com/dotnet/sdk/pull/46361 --- - eng/Publishing.props | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + eng/Publishing.props | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props -index d5604fbf8..7517ca4e5 100644 +index d5604fbf8..d7fd329ae 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props -@@ -2,7 +2,7 @@ +@@ -2,7 +2,6 @@ - --- -2.47.1.windows.2 From 275b4cc20e4830d6ec361b7683425b78a5568e46 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 09:37:10 +0100 Subject: [PATCH 13/17] Remove CRLF --- .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 97d5df5165c65664e5c66dd7423af026f615056a Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 11:36:42 +0100 Subject: [PATCH 14/17] Use different darc --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 91e9458e9a3d..8e93b36a3116 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.25081.2", + "version": "1.1.0-beta.25106.1", "commands": [ "darc" ] From 8dba8b48ee77314e70403f62cffa3c7c907acf73 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 15/17] Add NU1510 to NoWarn property --- 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 e50dd3b0bf1c..74428e3acd4e 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 b8fd5cfd42a15240438883ce3781813f8dcda901 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 23:59:12 +0100 Subject: [PATCH 16/17] Remove the patch --- ...0001-use-the-documented-artifact-ext.patch | 23 ------------------- 1 file changed, 23 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 bcaef666bad3..000000000000 --- a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Premek Vysoky -Date: Wed, 5 Feb 2025 12:51:35 +0100 -Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) - -This might help with the VMR sync problems we have in https://github.com/dotnet/sdk/pull/46361 ---- - eng/Publishing.props | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index d5604fbf8..d7fd329ae 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -2,7 +2,6 @@ - - - -+ PublishFlatContainer="false" /> - -- - From ecf5fcc71ee9c2db9dc8c0289c91b35dc4206cf2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 7 Feb 2025 16:23:24 +0100 Subject: [PATCH 17/17] Add NU1511 to NoWarn property --- 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 74428e3acd4e..882a2a595795 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) ]]>