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

Actually only do this for netstandard.

Browse source
This commit is contained in:
Chris Rummel 2021-10-21 21:58:56 -05:00
parent de12f87965
commit 77b70c9c64
No known key found for this signature in database
GPG key ID: DB9B2B231CB67DC7
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch
View file

@ -1,4 +1,4 @@
From bb17144917b0e242214a10467507db5f987e3af8 Mon Sep 17 00:00:00 2001 From aed379060eb37815d1eebd1cb5232d5a0cc931bc Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com> From: Michael Simons <msimons@microsoft.com>
Date: Tue, 17 Aug 2021 21:13:07 +0000 Date: Tue, 17 Aug 2021 21:13:07 +0000
Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0
@ -55,7 +55,7 @@ index 6fd5bd260..3de830b25 100644
<IsCore>true</IsCore> <IsCore>true</IsCore>
</PropertyGroup> </PropertyGroup>
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
index f11dd752b..babf5bbef 100644 index f11dd752b..d4f11aad5 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
@ -63,7 +63,7 @@ index f11dd752b..babf5bbef 100644
<ILMergeSubpath Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">ilmerge\</ILMergeSubpath> <ILMergeSubpath Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">ilmerge\</ILMergeSubpath>
<PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)' AND '$(IsBuildOnlyXPLATProjects)' != 'true'">Desktop/</PackagePathDir> <PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)' AND '$(IsBuildOnlyXPLATProjects)' != 'true'">Desktop/</PackagePathDir>
- <PackagePathDir Condition="'$(TargetFramework)' == '$(NetStandardVersion)'">CoreCLR/</PackagePathDir> - <PackagePathDir Condition="'$(TargetFramework)' == '$(NetStandardVersion)'">CoreCLR/</PackagePathDir>
+ <PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0'">CoreCLR/</PackagePathDir> + <PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0'">CoreCLR/</PackagePathDir>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll"> <TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll">
@ -80,7 +80,7 @@ index e30a079eb..c2b8fe241 100644
<NoWarn>$(NoWarn);CS1591;CS1574</NoWarn> <NoWarn>$(NoWarn);CS1591;CS1574</NoWarn>
<PackProject>true</PackProject> <PackProject>true</PackProject>
diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
index bbc5ba480..b1d16aa51 100644 index bbc5ba480..be230f29b 100644
--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
@ -96,7 +96,7 @@ index bbc5ba480..b1d16aa51 100644
</ItemGroup> </ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' "> - <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Security.Cryptography.ProtectedData" /> <PackageReference Include="System.Security.Cryptography.ProtectedData" />
</ItemGroup> </ItemGroup>
@ -113,7 +113,7 @@ index 65f261dc1..f29551741 100644
<NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn> <NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn>
<PackProject>true</PackProject> <PackProject>true</PackProject>
diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
index dfbfcaa8d..7de38de78 100644 index dfbfcaa8d..bfca46bec 100644
--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
@ -121,7 +121,7 @@ index dfbfcaa8d..7de38de78 100644
</ItemGroup> </ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' "> - <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.ComponentModel.Composition" /> <PackageReference Include="System.ComponentModel.Composition" />
</ItemGroup> </ItemGroup>

6
src/SourceBuild/tarball/patches/nuget-client/0007-NuGet.Build.Tasks.Pack-source-build-support.patch
View file

@ -1,4 +1,4 @@
From e4fcd14ceca14d4b1995b4244e33923eef7b9f55 Mon Sep 17 00:00:00 2001 From 36e519a13431f36cd30e44a91d3b4f81c6753528 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com> From: Michael Simons <msimons@microsoft.com>
Date: Fri, 27 Aug 2021 01:52:56 +0000 Date: Fri, 27 Aug 2021 01:52:56 +0000
Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support
@ -8,11 +8,11 @@ Subject: [PATCH 7/8] NuGet.Build.Tasks.Pack source-build support
1 file changed, 5 insertions(+), 2 deletions(-) 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
index babf5bbef..769406b67 100644 index d4f11aad5..f4d083e52 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj --- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj +++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
@@ -180,13 +180,16 @@ @@ -180,13 +180,16 @@
<PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0'">CoreCLR/</PackagePathDir> <PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0'">CoreCLR/</PackagePathDir>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
- <TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll"> - <TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll">