diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 03d998e11759..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.25105.4", + "version": "1.1.0-beta.25106.1", "commands": [ "darc" ] 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 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f930558260..1dc027798ab1 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 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + 4ccad7689eaf96f30d41709369bebc888e4a5db3 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b7ea55319536..94fe42a63740 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.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 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 @@ -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+