Skip to content

[main] Update dependencies from nuget/nuget.client #36016

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

Closed
wants to merge 4 commits into from
Closed

[main] Update dependencies from nuget/nuget.client #36016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00deeb9
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Oct 11, 2023
6c0b901
Update minimumMSBuildVersion
ViktorHofer Oct 12, 2023
3a36769
Merge remote-tracking branch 'origin/main' into darc-main-c0d35613-f4…
ViktorHofer Oct 12, 2023
9b7db15
Update failing test
ViktorHofer Oct 12, 2023
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
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,69 +116,69 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>773ffa53a9837a2cec884ebf9c491e463a095120</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.8.0-rc.122">
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Commands" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Commands" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.8.0-rc.122">
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Common" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Common" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Configuration" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Configuration" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Credentials" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Credentials" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.8.0-rc.122">
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Frameworks" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.LibraryModel" Version="6.8.0-rc.122">
<Dependency Name="NuGet.LibraryModel" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.ProjectModel" Version="6.8.0-rc.122">
<Dependency Name="NuGet.ProjectModel" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Protocol" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Protocol" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Packaging" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Packaging" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="NuGet.Versioning" Version="6.8.0-rc.122">
<Dependency Name="NuGet.Versioning" Version="6.9.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>0dd5a1ea536201af94725353e4bc711d7560b246</Sha>
<Sha>67959d51c158942cdfc2aa5e14e37429931e6579</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23509-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.8.0-rc.122</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.8.0-rc.122</NuGetBuildTasksConsolePackageVersion>
<NuGetBuildTasksPackageVersion>6.9.0-preview.1.12</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.9.0-preview.1.12</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.8.0-rc.122</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.8.0-rc.122</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.8.0-rc.122</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.8.0-rc.122</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.8.0-rc.122</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.8.0-rc.122</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.8.0-rc.122</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.8.0-rc.122</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.8.0-rc.122</NuGetVersioningPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.9.0-preview.1.12</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.9.0-preview.1.12</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.9.0-preview.1.12</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.9.0-preview.1.12</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.9.0-preview.1.12</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.9.0-preview.1.12</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.9.0-preview.1.12</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.9.0-preview.1.12</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.9.0-preview.1.12</NuGetVersioningPackageVersion>
<NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
<NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/redist/minimumMSBuildVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.7.0
17.7.2
16 changes: 8 additions & 8 deletions src/Tests/Microsoft.DotNet.PackageInstall.Tests/NuGetPackageInstallerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public async Task GivenARelativeSourcePathInstallSucceeds()
}

[Fact]
public void GivenNoPackageSourceMappingItShouldError()
public async Task GivenNoPackageSourceMappingItShouldError()
{
string getTestLocalFeedPath = GetTestLocalFeedPath();
string relativePath = Path.GetRelativePath(Environment.CurrentDirectory, getTestLocalFeedPath);
Expand All @@ -179,16 +179,16 @@ public void GivenNoPackageSourceMappingItShouldError()
var patterns = new ReadOnlyDictionary<string, IReadOnlyList<string>>(dictionary);
var mockPackageSourceMapping = new PackageSourceMapping(patterns);

Action a = () => _toolInstaller.DownloadPackageAsync(
Func<Task> a = async () => await _toolInstaller.DownloadPackageAsync(
TestPackageId,
new NuGetVersion(TestPackageVersion),
new PackageSourceLocation(sourceFeedOverrides: new[] { relativePath }),
packageSourceMapping: mockPackageSourceMapping).GetAwaiter().GetResult();
a.Should().Throw<NuGetPackageInstallerException>().And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToFindSourceUnderPackageSourceMapping, TestPackageId));
packageSourceMapping: mockPackageSourceMapping);
(await a.Should().ThrowAsync<NuGetPackageInstallerException>()).And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToFindSourceUnderPackageSourceMapping, TestPackageId));
}

[Fact]
public void GivenPackageSourceMappingFeedNotFoundItShouldError()
public async Task GivenPackageSourceMappingFeedNotFoundItShouldError()
{
string getTestLocalFeedPath = GetTestLocalFeedPath();
string relativePath = Path.GetRelativePath(Environment.CurrentDirectory, getTestLocalFeedPath);
Expand All @@ -200,12 +200,12 @@ public void GivenPackageSourceMappingFeedNotFoundItShouldError()
var patterns = new ReadOnlyDictionary<string, IReadOnlyList<string>>(dictionary);
var mockPackageSourceMapping = new PackageSourceMapping(patterns);

Action a = () => _toolInstaller.DownloadPackageAsync(
Func<Task> a = async () => await _toolInstaller.DownloadPackageAsync(
TestPackageId,
new NuGetVersion(TestPackageVersion),
new PackageSourceLocation(sourceFeedOverrides: new[] { relativePath }),
packageSourceMapping: mockPackageSourceMapping).GetAwaiter().GetResult();
a.Should().Throw<NuGetPackageInstallerException>().And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToMapSourceUnderPackageSourceMapping, TestPackageId));
packageSourceMapping: mockPackageSourceMapping);
(await a.Should().ThrowAsync<NuGetPackageInstallerException>()).And.Message.Should().Contain(string.Format(Cli.NuGetPackageDownloader.LocalizableStrings.FailedToMapSourceUnderPackageSourceMapping, TestPackageId));
}

[Fact]
Expand Down