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

Patch resolution

Browse source
This commit is contained in:
Chris Rummel 2021-10-21 19:36:39 -05:00
parent dde04b27b1
commit de12f87965
No known key found for this signature in database
GPG key ID: DB9B2B231CB67DC7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From f5d3b8b8c189df9bf1644a9e26b3c6b57e353e84 Mon Sep 17 00:00:00 2001 From e4fcd14ceca14d4b1995b4244e33923eef7b9f55 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 f11dd752b..1be4f8952 100644 index babf5bbef..769406b67 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)' == '$(NetStandardVersion)'">CoreCLR/</PackagePathDir> <PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.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">