Skip to content

Commit

Permalink
[release/8.0.3xx] Update dependencies from nuget/nuget.client (#38037)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MiYanni
MiYanni authored Jan 24, 2024
2 parents 9ea2d13 + 112cc76 commit 8382d65
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 43 deletions.
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,69 +115,69 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>3f1acb59718cadf111a0a796681e3d3509bb3381</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.9.0-rc.74">
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Commands" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Commands" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.9.0-rc.74">
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Common" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Common" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Configuration" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Configuration" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Credentials" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Credentials" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.9.0-rc.74">
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Frameworks" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.LibraryModel" Version="6.9.0-rc.74">
<Dependency Name="NuGet.LibraryModel" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.ProjectModel" Version="6.9.0-rc.74">
<Dependency Name="NuGet.ProjectModel" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Protocol" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Protocol" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Packaging" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Packaging" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="NuGet.Versioning" Version="6.9.0-rc.74">
<Dependency Name="NuGet.Versioning" Version="6.10.0-preview.1.12">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
<Sha>e4899ee48ff3d7787ee345f546c818ce6b962807</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.9.0-release-23627-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>6.9.0-rc.74</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.9.0-rc.74</NuGetBuildTasksConsolePackageVersion>
<NuGetBuildTasksPackageVersion>6.10.0-preview.1.12</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksConsolePackageVersion>6.10.0-preview.1.12</NuGetBuildTasksConsolePackageVersion>
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.9.0-rc.74</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.9.0-rc.74</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.9.0-rc.74</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.9.0-rc.74</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.9.0-rc.74</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.9.0-rc.74</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.9.0-rc.74</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.9.0-rc.74</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.9.0-rc.74</NuGetVersioningPackageVersion>
<NuGetBuildTasksPackPackageVersion>6.10.0-preview.1.12</NuGetBuildTasksPackPackageVersion>
<NuGetCommandLineXPlatPackageVersion>6.10.0-preview.1.12</NuGetCommandLineXPlatPackageVersion>
<NuGetProjectModelPackageVersion>6.10.0-preview.1.12</NuGetProjectModelPackageVersion>
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.10.0-preview.1.12</MicrosoftBuildNuGetSdkResolverPackageVersion>
<NuGetCommonPackageVersion>6.10.0-preview.1.12</NuGetCommonPackageVersion>
<NuGetConfigurationPackageVersion>6.10.0-preview.1.12</NuGetConfigurationPackageVersion>
<NuGetFrameworksPackageVersion>6.10.0-preview.1.12</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>6.10.0-preview.1.12</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.10.0-preview.1.12</NuGetVersioningPackageVersion>
<NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
<NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/Tests/dotnet-new.Tests/TestDirectoryBuildProps/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<!-- Disable CPM for the tests as otherwise it'll get enabled when the root directory.packages.props is found -->
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>
4 changes: 4 additions & 0 deletions src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests
<WriteLinesToFile Lines="$(GeneratedText)" File="$(GeneratedFilePath)" WriteOnlyWhenDifferent="true" Overwrite="true" />
</Target>

<Target Name="CopyDBPToArtifactsTmpDir" AfterTargets="Build">
<Copy SourceFiles="TestDirectoryBuildProps/Directory.Build.props" DestinationFolder="$(ArtifactsTmpDir)" />
</Target>

<ItemGroup>
<Compile Remove="TestTemplates\**\*" />
</ItemGroup>
Expand Down

0 comments on commit 8382d65

Please sign in to comment.