From 7f468fe5e66b37f1a35d989fa263a79e2b0212c5 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 22 Oct 2021 10:21:51 -0500 Subject: [PATCH] Add patch issues to the patches. --- .../0003-Restore-building-all-TFMs-for-source-build.patch | 1 + .../nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch | 8 +++++--- ...1-Also-build-for-netstandard2.0-to-support-NuGet.patch | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch index ddb0688ae..04c684a0d 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0003-Restore-building-all-TFMs-for-source-build.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Restore building all TFMs for source-build Required for omnisharp, nuget-client, templating Background Issue: https://github.com/dotnet/source-build/issues/2542 +Patch removal issue: https://github.com/dotnet/source-build/issues/2556 --- src/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch index 202bda09a..2400ef3e6 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch @@ -1,8 +1,10 @@ -From aed379060eb37815d1eebd1cb5232d5a0cc931bc Mon Sep 17 00:00:00 2001 +From de74c87d3f9364be1f3bdba43844c8de92704757 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 17 Aug 2021 21:13:07 +0000 Subject: [PATCH 2/8] Update netcoreapp TFMs to 6.0 +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2555. + --- build/common.project.props | 10 +++++----- build/common.targets | 2 +- @@ -80,7 +82,7 @@ index e30a079eb..c2b8fe241 100644 $(NoWarn);CS1591;CS1574 true diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj -index bbc5ba480..be230f29b 100644 +index bbc5ba480..18b597c74 100644 --- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj @@ -6,7 +6,6 @@ @@ -113,7 +115,7 @@ index 65f261dc1..f29551741 100644 $(NoWarn);CS1591;CS1574;CS1573 true diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj -index dfbfcaa8d..bfca46bec 100644 +index dfbfcaa8d..a6bb51d6b 100644 --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj @@ -35,7 +35,7 @@ diff --git a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch index de9bbee75..1194e09a5 100644 --- a/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch +++ b/src/SourceBuild/tarball/patches/xdt/0001-Also-build-for-netstandard2.0-to-support-NuGet.patch @@ -3,6 +3,8 @@ From: Chris Rummel Date: Thu, 21 Oct 2021 16:29:32 -0500 Subject: [PATCH] Also build for netstandard2.0 to support NuGet. +Patch removal is tracked by https://github.com/dotnet/source-build/issues/2557. + --- .../Microsoft.Web.XmlTransform.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)