From 19d344f870bb4d3091dd0934c6a3db18b1fe598d Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 11 Oct 2021 17:38:18 -0500 Subject: [PATCH 1/3] Move Omnisharp fix to the correct place. We had some crossed PRs and this got added while the other patches were being moved. This moves it to the correct place. --- .../runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/SourceBuild/tarball/{content => }/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch (100%) diff --git a/src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch rename to src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch From bea2cf17d7926c03fcfda0f275c0eec16556d048 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 12 Oct 2021 14:06:51 -0500 Subject: [PATCH 2/3] Update patch to apply to new hash. --- ...-Fix-Omnisharp-add-needed-extra-TFMs.patch | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch index 192ed351941d..334cc8c9ad25 100644 --- a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch +++ b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch @@ -1,7 +1,7 @@ -From 93de82c03ff71f897599db2824b959d020b877bd Mon Sep 17 00:00:00 2001 +From 827f1e036db2082b56b003f870f5ff8dabc9b1ed Mon Sep 17 00:00:00 2001 From: Chris Rummel -Date: Thu, 30 Sep 2021 16:08:28 -0500 -Subject: [PATCH 1/2] Fix Omnisharp: Add needed extra TFMs. +Date: Tue, 12 Oct 2021 14:04:27 -0500 +Subject: [PATCH] Fix Omnisharp: Add needed extra TFMs. Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360. @@ -12,18 +12,18 @@ Omnisharp requires the net46 TFMs of this files explictly and we don't build the 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props -index 4d39fad397e..649c669517e 100644 +index a03b334346a..30418e38a2a 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props -@@ -27,7 +27,7 @@ - - +@@ -20,7 +20,7 @@ + false + $(RepositoryEngineeringDir)LicenseHeader.txt - net461;net462;net47;net471;net472 + net46;net461;net462;net47;net471;net472 - + diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj index 99037ae459c..848be41690c 100644 --- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj @@ -44,7 +44,7 @@ index 99037ae459c..848be41690c 100644 \ No newline at end of file + diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj -index adacc9b977e..38d4c145352 100644 +index a0a79e45adf..29c9b123ce5 100644 --- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj +++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj @@ -1,7 +1,7 @@ @@ -55,7 +55,7 @@ index adacc9b977e..38d4c145352 100644 + $(NetCoreAppCurrent);netstandard2.0;net46;net461 $(DefineConstants);RESOURCES_EXTENSIONS enable - + true -- -2.17.1 +2.18.0 From 5050a502fd6a4881341e56c600f5cf43119dd381 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 13 Oct 2021 08:00:26 -0500 Subject: [PATCH 3/3] Another project dependency. --- ...-Fix-Omnisharp-add-needed-extra-TFMs.patch | 53 +++++++++++++++++-- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch index 334cc8c9ad25..9072fbd5097e 100644 --- a/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch +++ b/src/SourceBuild/tarball/patches/runtime/0001-Fix-Omnisharp-add-needed-extra-TFMs.patch @@ -6,10 +6,12 @@ Subject: [PATCH] Fix Omnisharp: Add needed extra TFMs. Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360. --- - src/libraries/Directory.Build.props | 2 +- - .../ref/System.Resources.Extensions.csproj | 4 ++-- - .../src/System.Resources.Extensions.csproj | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) + src/libraries/Directory.Build.props | 2 +- + .../ref/System.Resources.Extensions.csproj | 4 ++-- + .../src/System.Resources.Extensions.csproj | 2 +- + .../ref/System.Runtime.CompilerServices.Unsafe.csproj | 4 ++-- + .../src/System.Runtime.CompilerServices.Unsafe.ilproj | 6 +++++- + 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index a03b334346a..30418e38a2a 100644 @@ -56,6 +58,49 @@ index a0a79e45adf..29c9b123ce5 100644 $(DefineConstants);RESOURCES_EXTENSIONS enable true +diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +index 766ea9a8ae7..5324c85404b 100644 +--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj ++++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj +@@ -3,7 +3,7 @@ + true + false + enable +- $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461 ++ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net46;net461 + + + +@@ -14,4 +14,4 @@ + + + +- +\ No newline at end of file ++ +diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +index a9e3de0c454..75467734292 100644 +--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj ++++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +@@ -1,6 +1,6 @@ +  + +- $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 ++ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net46;net461 + + IMPL + OPT +@@ -20,6 +20,10 @@ System.Runtime.CompilerServices.Unsafe + + netstandard + ++ ++ mscorlib ++ #define $(TargetFramework) ++ + + mscorlib + #define $(TargetFramework) -- 2.18.0