Skip to content

[release/6.0.4xx] Update dependencies from nuget/nuget.client #26062

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 2 commits into from
Jun 21, 2022
Merged

[release/6.0.4xx] Update dependencies from nuget/nuget.client #26062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1ee457
Update dependencies from https://github.com/nuget/nuget.client build …
dotnet-maestro[bot] Jun 16, 2022
5b06220
Merge pull request #24971 from dotnet/marcpopMSFT-allowtarchanges
marcpopMSFT Apr 26, 2022
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.3.0-preview.2.81">
<Dependency Name="NuGet.Build.Tasks" Version="6.3.0-preview.3.89">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>9c469e4dbfa8ba6085f0cd47d58207de90304a5a</Sha>
<Sha>6f99a10b228b521bb5d2c7412bb2e3c43e6e7b3f</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.3.0-preview.2.81">
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.3.0-preview.3.89">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>9c469e4dbfa8ba6085f0cd47d58207de90304a5a</Sha>
<Sha>6f99a10b228b521bb5d2c7412bb2e3c43e6e7b3f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.3.0-preview-20220615-12">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.3.0-preview.2.81</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.3.0-preview.3.89</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.0.0</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.3.0-preview.2.81</MicrosoftBuildNuGetSdkResolverPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.3.0-preview.3.89</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>
Expand Down
5 changes: 3 additions & 2 deletions src/Tests/HelixTasks/TarGzFileCreateFromDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ public sealed class TarGzFileCreateFromDirectory : ToolTask
protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
{
int returnCode = base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands);

if (IgnoreExitCode)

// returnCode 1 indicates that files changed during tar. In our case, it is likely being overwritten by another copy of the same file, so we can safely ignore this warning.
if (IgnoreExitCode || returnCode == 1)
{
returnCode = 0;
}
Expand Down