diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index c2a768886565..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.25072.2",
+ "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 6417205bc681..f7e98462c4a1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -147,74 +147,74 @@
https://github.com/dotnet/aspnetcore
3c7e5681f30d0aacc62eda00c7df371d4ed705d9
-
+
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
@@ -638,13 +638,13 @@
https://github.com/dotnet/runtime
b98cabca124ca73be9247c5f7b6796c6ce55e816
-
+
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 452a4a627b8d..11b2a48fda3b 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
@@ -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.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/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index e50dd3b0bf1c..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;$(RepoNoWarns)
+ %24(NoWarn);NU1903;NU1510;NU1511;$(RepoNoWarns)
]]>
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 @@
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
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/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);