[release/10.0.1xx-preview1] Update dependencies from nuget/nuget.clie…

…nt (#46361) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Daniel Plaisted <[email protected]> Co-authored-by: Nikola Milosavljevic <[email protected]> Co-authored-by: Premek Vysoky <[email protected]> Co-authored-by: Ella Hathaway <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
dotnet · Feb 7, 2025 · 1e6a78d · 1e6a78d
1 parent e1a2886
commit 1e6a78d
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 119 deletions.
diff --git 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
@@ -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
@@ -147,74 +147,74 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>3c7e5681f30d0aacc62eda00c7df371d4ed705d9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.11">
+    <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
       <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Common" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Common" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.11">
+    <Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.17">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
+      <Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25073-07">
       <Uri>https://github.com/microsoft/vstest</Uri>
@@ -638,13 +638,13 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>b98cabca124ca73be9247c5f7b6796c6ce55e816</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25081.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>f1b6b9baa2a3e66a52496d3b3e1423b5fcb1906e</Sha>
+      <Sha>0a9f6b177026a7473b9225355269c2c9a90b777f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25081.2">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>f1b6b9baa2a3e66a52496d3b3e1423b5fcb1906e</Sha>
+      <Sha>0a9f6b177026a7473b9225355269c2c9a90b777f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="10.0.0-preview.24602.1">
       <Uri>https://github.com/dotnet/scenario-tests</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -76,7 +76,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.25072.2</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.25081.2</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/aspire -->
@@ -146,18 +146,18 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/nuget/nuget.client -->
-    <NuGetBuildTasksPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackageVersion>
-    <NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.11</NuGetBuildTasksConsolePackageVersion>
-    <NuGetLocalizationPackageVersion>6.14.0-preview.1.11</NuGetLocalizationPackageVersion>
-    <NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackPackageVersion>
-    <NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.11</NuGetCommandLineXPlatPackageVersion>
-    <NuGetProjectModelPackageVersion>6.14.0-preview.1.11</NuGetProjectModelPackageVersion>
-    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.11</MicrosoftBuildNuGetSdkResolverPackageVersion>
-    <NuGetCommonPackageVersion>6.14.0-preview.1.11</NuGetCommonPackageVersion>
-    <NuGetConfigurationPackageVersion>6.14.0-preview.1.11</NuGetConfigurationPackageVersion>
-    <NuGetFrameworksPackageVersion>6.14.0-preview.1.11</NuGetFrameworksPackageVersion>
-    <NuGetPackagingPackageVersion>6.14.0-preview.1.11</NuGetPackagingPackageVersion>
-    <NuGetVersioningPackageVersion>6.14.0-preview.1.11</NuGetVersioningPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.14.0-preview.1.17</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.17</NuGetBuildTasksConsolePackageVersion>
+    <NuGetLocalizationPackageVersion>6.14.0-preview.1.17</NuGetLocalizationPackageVersion>
+    <NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.17</NuGetBuildTasksPackPackageVersion>
+    <NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.17</NuGetCommandLineXPlatPackageVersion>
+    <NuGetProjectModelPackageVersion>6.14.0-preview.1.17</NuGetProjectModelPackageVersion>
+    <MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.17</MicrosoftBuildNuGetSdkResolverPackageVersion>
+    <NuGetCommonPackageVersion>6.14.0-preview.1.17</NuGetCommonPackageVersion>
+    <NuGetConfigurationPackageVersion>6.14.0-preview.1.17</NuGetConfigurationPackageVersion>
+    <NuGetFrameworksPackageVersion>6.14.0-preview.1.17</NuGetFrameworksPackageVersion>
+    <NuGetPackagingPackageVersion>6.14.0-preview.1.17</NuGetPackagingPackageVersion>
+    <NuGetVersioningPackageVersion>6.14.0-preview.1.17</NuGetVersioningPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/vstest -->

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -67,7 +67,7 @@
       <OldText><![CDATA[</Project>]]></OldText>
       <NewText>
         <![CDATA[  <PropertyGroup>
-    <NoWarn>%24(NoWarn);NU1903;$(RepoNoWarns)</NoWarn>
+    <NoWarn>%24(NoWarn);NU1903;NU1510;NU1511;$(RepoNoWarns)</NoWarn>
   </PropertyGroup>
 </Project>]]>
       </NewText>

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
diff --git 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<FrameworkPackages>();
 
-        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
@@ -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
@@ -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);