dotnet-installer/eng/source-build-patches/0003-Use-PVP-for-PlatformAbstractions-and-NuGet.Versionin.patch

43 lines
2.2 KiB
Diff

From 1959179503f952730a239ffe02bc851c6e717aa8 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 4 Feb 2021 21:27:04 +0000
Subject: [PATCH] Use PVP for PlatformAbstractions and NuGet.Versioning
---
eng/Versions.props | 4 ++
src/core-sdk-tasks/core-sdk-tasks.csproj | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index be68d9a..993a87d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -91,6 +91,10 @@
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
</PropertyGroup>
<PropertyGroup>
+ <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
+ <NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion>
+ </PropertyGroup>
+ <PropertyGroup>
<!-- Cross-release dependency versions -->
<MicrosoftDotNetCommonItemTemplates50PackageVersion>5.0.3</MicrosoftDotNetCommonItemTemplates50PackageVersion>
<MicrosoftAspNetCoreAppRuntime50PackageVersion>5.0.0-rc.2.20474.4</MicrosoftAspNetCoreAppRuntime50PackageVersion>
diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj
index 00420b6ba..2e03bd0d1 100644
--- a/src/core-sdk-tasks/core-sdk-tasks.csproj
+++ b/src/core-sdk-tasks/core-sdk-tasks.csproj
@@ -11,8 +11,8 @@
<PackageReference Include="Microsoft.Build" Version="15.7.179" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
- <PackageReference Include="NuGet.Versioning" Version="5.8.0" />
- <PackageReference Include="NuGet.Packaging" Version="5.8.0" />
+ <PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
+ <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
<PackageReference Include="WindowsAzure.Storage" Version="8.4.0" Condition="'$(DotNetBuildFromSource)' != 'true'" />
</ItemGroup>
--
2.21.3