Skip to content

Commit 1e6a78d

Browse files
dotnet-maestro[bot]dsplaistedNikolaMilosavljevicpremunellahathaway
authored
[release/10.0.1xx-preview1] Update dependencies from nuget/nuget.client (#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]>
1 parent e1a2886 commit 1e6a78d

File tree

9 files changed

+63
-119
lines changed

9 files changed

+63
-119
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25072.2",
6+
"version": "1.1.0-beta.25106.1",
77
"commands": [
88
"darc"
99
]

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,5 @@
6767
*.verified.txt text eol=lf working-tree-encoding=UTF-8
6868
*.verified.xml text eol=lf working-tree-encoding=UTF-8
6969
*.verified.json text eol=lf working-tree-encoding=UTF-8
70+
71+
src/SourceBuild/patches/**/*.patch text eol=lf

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -147,74 +147,74 @@
147147
<Uri>https://github.com/dotnet/aspnetcore</Uri>
148148
<Sha>3c7e5681f30d0aacc62eda00c7df371d4ed705d9</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.11">
150+
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.17">
151151
<Uri>https://github.com/nuget/nuget.client</Uri>
152-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
152+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
153153
</Dependency>
154-
<Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.11">
154+
<Dependency Name="NuGet.Build.Tasks" Version="6.14.0-preview.1.17">
155155
<Uri>https://github.com/nuget/nuget.client</Uri>
156-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
156+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
157157
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
158158
</Dependency>
159-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.11">
159+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.14.0-preview.1.17">
160160
<Uri>https://github.com/nuget/nuget.client</Uri>
161-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
161+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
162162
</Dependency>
163-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.11">
163+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.14.0-preview.1.17">
164164
<Uri>https://github.com/nuget/nuget.client</Uri>
165-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
165+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
166166
</Dependency>
167-
<Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.11">
167+
<Dependency Name="NuGet.Commands" Version="6.14.0-preview.1.17">
168168
<Uri>https://github.com/nuget/nuget.client</Uri>
169-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
169+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
170170
</Dependency>
171-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.11">
171+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.14.0-preview.1.17">
172172
<Uri>https://github.com/nuget/nuget.client</Uri>
173-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
173+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
174174
</Dependency>
175-
<Dependency Name="NuGet.Common" Version="6.14.0-preview.1.11">
175+
<Dependency Name="NuGet.Common" Version="6.14.0-preview.1.17">
176176
<Uri>https://github.com/nuget/nuget.client</Uri>
177-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
177+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
178178
</Dependency>
179-
<Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.11">
179+
<Dependency Name="NuGet.Configuration" Version="6.14.0-preview.1.17">
180180
<Uri>https://github.com/nuget/nuget.client</Uri>
181-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
181+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
182182
</Dependency>
183-
<Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.11">
183+
<Dependency Name="NuGet.Credentials" Version="6.14.0-preview.1.17">
184184
<Uri>https://github.com/nuget/nuget.client</Uri>
185-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
185+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
186186
</Dependency>
187-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.11">
187+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.14.0-preview.1.17">
188188
<Uri>https://github.com/nuget/nuget.client</Uri>
189-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
189+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
190190
</Dependency>
191-
<Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.11">
191+
<Dependency Name="NuGet.Frameworks" Version="6.14.0-preview.1.17">
192192
<Uri>https://github.com/nuget/nuget.client</Uri>
193-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
193+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
194194
</Dependency>
195-
<Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.11">
195+
<Dependency Name="NuGet.LibraryModel" Version="6.14.0-preview.1.17">
196196
<Uri>https://github.com/nuget/nuget.client</Uri>
197-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
197+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
198198
</Dependency>
199-
<Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.11">
199+
<Dependency Name="NuGet.ProjectModel" Version="6.14.0-preview.1.17">
200200
<Uri>https://github.com/nuget/nuget.client</Uri>
201-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
201+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
202202
</Dependency>
203-
<Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.11">
203+
<Dependency Name="NuGet.Protocol" Version="6.14.0-preview.1.17">
204204
<Uri>https://github.com/nuget/nuget.client</Uri>
205-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
205+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
206206
</Dependency>
207-
<Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.11">
207+
<Dependency Name="NuGet.Packaging" Version="6.14.0-preview.1.17">
208208
<Uri>https://github.com/nuget/nuget.client</Uri>
209-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
209+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
210210
</Dependency>
211-
<Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.11">
211+
<Dependency Name="NuGet.Versioning" Version="6.14.0-preview.1.17">
212212
<Uri>https://github.com/nuget/nuget.client</Uri>
213-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
213+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
214214
</Dependency>
215-
<Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.11">
215+
<Dependency Name="NuGet.Localization" Version="6.14.0-preview.1.17">
216216
<Uri>https://github.com/nuget/nuget.client</Uri>
217-
<Sha>a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f</Sha>
217+
<Sha>4ccad7689eaf96f30d41709369bebc888e4a5db3</Sha>
218218
</Dependency>
219219
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25073-07">
220220
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -638,13 +638,13 @@
638638
<Uri>https://github.com/dotnet/runtime</Uri>
639639
<Sha>b98cabca124ca73be9247c5f7b6796c6ce55e816</Sha>
640640
</Dependency>
641-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25072.2">
641+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25081.2">
642642
<Uri>https://github.com/dotnet/arcade-services</Uri>
643-
<Sha>f1b6b9baa2a3e66a52496d3b3e1423b5fcb1906e</Sha>
643+
<Sha>0a9f6b177026a7473b9225355269c2c9a90b777f</Sha>
644644
</Dependency>
645-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25072.2">
645+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25081.2">
646646
<Uri>https://github.com/dotnet/arcade-services</Uri>
647-
<Sha>f1b6b9baa2a3e66a52496d3b3e1423b5fcb1906e</Sha>
647+
<Sha>0a9f6b177026a7473b9225355269c2c9a90b777f</Sha>
648648
</Dependency>
649649
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="10.0.0-preview.24602.1">
650650
<Uri>https://github.com/dotnet/scenario-tests</Uri>

‎eng/Versions.props

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</PropertyGroup>
7777
<PropertyGroup>
7878
<!-- Dependency from https://github.com/dotnet/arcade-services -->
79-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25072.2</MicrosoftDotNetDarcLibVersion>
79+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25081.2</MicrosoftDotNetDarcLibVersion>
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -146,18 +146,18 @@
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<!-- Dependencies from https://github.com/nuget/nuget.client -->
149-
<NuGetBuildTasksPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackageVersion>
150-
<NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.11</NuGetBuildTasksConsolePackageVersion>
151-
<NuGetLocalizationPackageVersion>6.14.0-preview.1.11</NuGetLocalizationPackageVersion>
152-
<NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.11</NuGetBuildTasksPackPackageVersion>
153-
<NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.11</NuGetCommandLineXPlatPackageVersion>
154-
<NuGetProjectModelPackageVersion>6.14.0-preview.1.11</NuGetProjectModelPackageVersion>
155-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.11</MicrosoftBuildNuGetSdkResolverPackageVersion>
156-
<NuGetCommonPackageVersion>6.14.0-preview.1.11</NuGetCommonPackageVersion>
157-
<NuGetConfigurationPackageVersion>6.14.0-preview.1.11</NuGetConfigurationPackageVersion>
158-
<NuGetFrameworksPackageVersion>6.14.0-preview.1.11</NuGetFrameworksPackageVersion>
159-
<NuGetPackagingPackageVersion>6.14.0-preview.1.11</NuGetPackagingPackageVersion>
160-
<NuGetVersioningPackageVersion>6.14.0-preview.1.11</NuGetVersioningPackageVersion>
149+
<NuGetBuildTasksPackageVersion>6.14.0-preview.1.17</NuGetBuildTasksPackageVersion>
150+
<NuGetBuildTasksConsolePackageVersion>6.14.0-preview.1.17</NuGetBuildTasksConsolePackageVersion>
151+
<NuGetLocalizationPackageVersion>6.14.0-preview.1.17</NuGetLocalizationPackageVersion>
152+
<NuGetBuildTasksPackPackageVersion>6.14.0-preview.1.17</NuGetBuildTasksPackPackageVersion>
153+
<NuGetCommandLineXPlatPackageVersion>6.14.0-preview.1.17</NuGetCommandLineXPlatPackageVersion>
154+
<NuGetProjectModelPackageVersion>6.14.0-preview.1.17</NuGetProjectModelPackageVersion>
155+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.14.0-preview.1.17</MicrosoftBuildNuGetSdkResolverPackageVersion>
156+
<NuGetCommonPackageVersion>6.14.0-preview.1.17</NuGetCommonPackageVersion>
157+
<NuGetConfigurationPackageVersion>6.14.0-preview.1.17</NuGetConfigurationPackageVersion>
158+
<NuGetFrameworksPackageVersion>6.14.0-preview.1.17</NuGetFrameworksPackageVersion>
159+
<NuGetPackagingPackageVersion>6.14.0-preview.1.17</NuGetPackagingPackageVersion>
160+
<NuGetVersioningPackageVersion>6.14.0-preview.1.17</NuGetVersioningPackageVersion>
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/Microsoft/vstest -->

‎src/SourceBuild/content/repo-projects/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<OldText><![CDATA[</Project>]]></OldText>
6868
<NewText>
6969
<![CDATA[ <PropertyGroup>
70-
<NoWarn>%24(NoWarn);NU1903;$(RepoNoWarns)</NoWarn>
70+
<NoWarn>%24(NoWarn);NU1903;NU1510;NU1511;$(RepoNoWarns)</NoWarn>
7171
</PropertyGroup>
7272
</Project>]]>
7373
</NewText>

‎src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ public static FrameworkPackages[] GetFrameworkPackages(NuGetFramework framework,
7777
{
7878
var frameworkPackages = new List<FrameworkPackages>();
7979

80-
if (frameworkReferences.Length == 0)
81-
{
82-
frameworkReferences = [DefaultFrameworkKey];
83-
}
84-
8580
foreach (var frameworkReference in frameworkReferences)
8681
{
8782
var frameworkKey = GetFrameworkKey(frameworkReference);

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ public void CompileConflictsAreNotRemovedFromRuntimeDepsAssets()
116116

117117
testProject.PackageReferences.Add(new TestPackageReference("Microsoft.AspNetCore.Mvc.Razor", "2.1.0"));
118118

119+
// This test relies on a package that would be pruned. This doesn't seem to be a customer scenario, it looks like it was
120+
// an easier way to test that files that were removed
121+
testProject.AdditionalProperties["RestoreEnablePackagePruning"] = "false";
122+
119123
var testAsset = _testAssetsManager.CreateTestProject(testProject);
120124

121125
var buildCommand = new BuildCommand(testAsset);

‎test/dotnet-list-package.Tests/GivenDotnetListPackage.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ public static void Main(string[] args)
179179
};
180180

181181
testProject.PackageReferences.Add(new TestPackageReference("NewtonSoft.Json", "9.0.1"));
182+
183+
// Disable package pruning so that there are still transitive dependencies to test the command
184+
testProject.AdditionalProperties["RestoreEnablePackagePruning"] = "false";
185+
182186
var testAsset = _testAssetsManager.CreateTestProject(testProject);
183187
var projectDirectory = Path.Combine(testAsset.Path, testProject.Name);
184188

0 commit comments

Comments
 (0)