diff --git a/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarns.patch b/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch similarity index 70% rename from src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarns.patch rename to src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch index ed5ac11f0557..d1d297915cfa 100644 --- a/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarns.patch +++ b/src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch @@ -1,14 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 13 May 2022 16:14:14 -0700 -Subject: [PATCH] Add NoWarns +Subject: [PATCH] Add NoWarn for NU1507 -NU1507 - This warning occurs when using NuGet central package management without defining +This warning occurs when using NuGet central package management without defining any Package Source Mappings. -NU1605 - Detected package downgrade: System.Memory from 4.5.5 to 4.5.4 -Backport: NU1507 - https://github.com/dotnet/razor-compiler/issues/242 -Backport: NU1605 - https://github.com/dotnet/source-build/issues/2973 +Workaround for: https://github.com/dotnet/razor-compiler/issues/242 --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) @@ -21,7 +19,7 @@ index a57125f5..019ac376 100644 $(NoWarn.Replace('1591', '')) $(NoWarn);0105 -+ $(NoWarn);NU1507;NU1605 ++ $(NoWarn);NU1507 $(WarningsNotAsErrors);CS1591 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 new file mode 100644 index 000000000000..fe1fcb1748b4 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn/0002-Lift-System.Memory-version.patch @@ -0,0 +1,28 @@ +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.1 + 5.0.0-preview.8.20407.11 +- 4.5.4 ++ 4.5.5 + 6.0.0 + 6.0.0 + 6.0.1