From b3c70508ee3882797db11a348d501466c83d3abf Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 29 Sep 2022 01:33:44 +0000 Subject: [PATCH] Remove backported roslyn source-build patch --- .../0002-Lift-System.Memory-version.patch | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0002-Lift-System.Memory-version.patch diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Lift-System.Memory-version.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Lift-System.Memory-version.patch deleted file mode 100644 index 0614d4884..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Lift-System.Memory-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 24 Aug 2022 12:21:13 +0000 -Subject: [PATCH] Lift System.Memory version - -System.Memory version needs to align with the runtime since System.Collections.Immutable is lifted in order to prevent the following situation: -error NU1605: Detected package downgrade: System.Memory from 4.5.5 to 4.5.4. Reference the package directly from the project to select a different version. [/repos/tarball-rc1/src/razor-compiler/artifacts/source-build/self/src/razor-compiler.sln] -error NU1605: Microsoft.CodeAnalysis.Razor -> Microsoft.CodeAnalysis.CSharp 4.4.0 -> Microsoft.CodeAnalysis.Common 4.4.0 -> System.Collections.Immutable 7.0.0-rc.1.22422.23 -> System.Memory (>= 4.5.5) [/repos/tarball-rc1/src/razor-compiler/artifacts/source-build/self/src/razor-compiler.sln] -error NU1605: Microsoft.CodeAnalysis.Razor -> Microsoft.CodeAnalysis.CSharp 4.4.0 -> Microsoft.CodeAnalysis.Common 4.4.0 -> System.Memory (>= 4.5.4) [/repos/tarball-rc1/src/razor-compiler/artifacts/source-build/self/src/razor-compiler.sln] - -Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 627f9c46824..711593e2a1e 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -214,7 +214,7 @@ - 5.0.0 - 6.0.3 - 5.0.0-preview.8.20407.11 -- 4.5.4 -+ 4.5.5 - 6.0.0 - 6.0.0 - 6.0.1