mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove additional NuGet.Client source-build patch that was backported

Browse source
This commit is contained in:
MichaelSimons 2022-03-28 16:19:26 +00:00
parent 5a6b001cc9
commit 091f8bc4e9
1 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch
View file

@ -1,28 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Tue, 23 Nov 2021 16:13:36 +0000
Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
Addresses:
NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
Backport issue: https://github.com/dotnet/source-build/issues/2311
---
build/packages.targets | 2 +-
1 file changed, 1 insertions(+), 1 deletions(-)
diff --git a/build/packages.targets b/build/packages.targets
index a0aa4cc..ef5a1cc 100644
--- a/build/packages.targets
+++ b/build/packages.targets
@@ -58,7 +59,7 @@
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
- <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
+ <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
<PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />