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

Fix patch conflict.

Browse source
This commit is contained in:
Chris Rummel 2021-10-22 10:19:59 -05:00
parent f951587509
commit ed6eb2db8e
No known key found for this signature in database
GPG key ID: DB9B2B231CB67DC7
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch
View file

@ -1,14 +1,15 @@
From 612f18bace3320572dc69b3ee56c0d942c29331f Mon Sep 17 00:00:00 2001 From be9f7f1415250433578ed6aa36da13a4442aff8f Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com> From: Chris Rummel <crummel@microsoft.com>
Date: Fri, 20 Aug 2021 15:30:52 -0500 Date: Fri, 20 Aug 2021 15:30:52 -0500
Subject: [PATCH] Build NuGet.Frameworks for netstandard as well for VSTest. Subject: [PATCH 6/8] Build NuGet.Frameworks for netstandard as well for
VSTest.
--- ---
src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +- src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
index 65f261dc1..ed81ecf24 100644 index f29551741..a89b516c6 100644
--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj --- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj +++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
@ -17,9 +18,9 @@ index 65f261dc1..ed81ecf24 100644
<Description>NuGet's understanding of target frameworks.</Description> <Description>NuGet's understanding of target frameworks.</Description>
- <TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks> - <TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworksLibrary);netstandard2.0</TargetFrameworks> + <TargetFrameworks>$(TargetFrameworksLibrary);netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">$(TargetFrameworks);net40</TargetFrameworks>
<TargetFramework /> <TargetFramework />
<NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn> <NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn>
<PackProject>true</PackProject>
-- --
2.18.0 2.31.1