Skip to content

[release/10.0.1xx-preview1] Update dependencies from nuget/nuget.client #46361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Feb 7, 2025
Merged

[release/10.0.1xx-preview1] Update dependencies from nuget/nuget.client #46361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d4d0438
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Jan 28, 2025
10e515d
Fix tests now that package pruning is enabled by default
dsplaisted Jan 29, 2025
d992386
Revert removal of workaround
dsplaisted Jan 29, 2025
e4d9f6a
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Jan 29, 2025
9e93af5
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Jan 30, 2025
a304046
Remove the patch - changes are now present in nuget.client repo
NikolaMilosavljevic Jan 31, 2025
6f30814
Bump darc
premun Feb 4, 2025
49247d5
Merge branch 'release/10.0.1xx-preview1' into darc-release/10.0.1xx-p…
premun Feb 4, 2025
7ab4fa0
Patch for nuget.client 6251
NikolaMilosavljevic Feb 4, 2025
05ebd11
Add a dummy patch to workaround the vmr-sync issue
NikolaMilosavljevic Feb 4, 2025
4b0d418
Merge branch 'release/10.0.1xx-preview1' into darc-release/10.0.1xx-p…
NikolaMilosavljevic Feb 5, 2025
d37a780
Try merging the patches
premun Feb 5, 2025
b751d4f
Put the spaces somewhere else than EOL
premun Feb 5, 2025
1314631
Fix the patch
premun Feb 5, 2025
1bff466
Merge branch 'release/10.0.1xx-preview1' into darc-release/10.0.1xx-p…
premun Feb 6, 2025
275b4cc
Remove CRLF
premun Feb 6, 2025
97d5df5
Use different darc
premun Feb 6, 2025
8dba8b4
Add NU1510 to NoWarn property
ellahathaway Feb 6, 2025
b8fd5cf
Remove the patch
premun Feb 6, 2025
ecf5fcc
Add NU1511 to NoWarn property
ViktorHofer Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
26 changes: 13 additions & 13 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
61 changes: 0 additions & 61 deletions src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions test/dotnet-list-package.Tests/GivenDotnetListPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down