From d2a2a2ac45c605c43615694c616fc0bea41b1c23 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 18 Oct 2023 13:09:53 -0500 Subject: [PATCH] Add patches for format repo --- .../0001-Explicitly-set-TFM-to-net9.0.patch | 51 +++++++++++++++++++ ...te-Microsoft.Build.Locator-to-1.6.10.patch | 23 +++++++++ 2 files changed, 74 insertions(+) create mode 100644 src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch create mode 100644 src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch new file mode 100644 index 000000000..2f1cabb2e --- /dev/null +++ b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Oct 2023 12:50:21 -0500 +Subject: [PATCH] Explicitly set TFM to net9.0 + +https://github.com/dotnet/source-build/issues/3663 +--- + perf/dotnet-format.Performance.csproj | 2 +- + src/dotnet-format.csproj | 2 +- + tests/dotnet-format.UnitTests.csproj | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj +index 677b7b9a..3e1387d1 100644 +--- a/perf/dotnet-format.Performance.csproj ++++ b/perf/dotnet-format.Performance.csproj +@@ -1,7 +1,7 @@ +  + + +- $(NetCurrent) ++ net9.0 + Exe + true + Release +diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj +index 5549fb71..8a77d03f 100644 +--- a/src/dotnet-format.csproj ++++ b/src/dotnet-format.csproj +@@ -1,7 +1,7 @@ +  + + +- $(NetCurrent) ++ net9.0 + Exe + Microsoft.CodeAnalysis.Tools + true +diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj +index c4311a1a..5b1bcfb9 100644 +--- a/tests/dotnet-format.UnitTests.csproj ++++ b/tests/dotnet-format.UnitTests.csproj +@@ -1,7 +1,7 @@ +  + + +- $(NetCurrent) ++ net9.0 + Microsoft.CodeAnalysis.Tools.Tests + + diff --git a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch new file mode 100644 index 000000000..95a2681b4 --- /dev/null +++ b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 18 Oct 2023 13:05:45 -0500 +Subject: [PATCH] Update Microsoft.Build.Locator to 1.6.10 + +https://github.com/dotnet/sdk/issues/36219 +--- + eng/Versions.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 961660e5..c330813b 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -40,7 +40,7 @@ + + 0.13.5 + 0.13.5 +- 1.5.5 ++ 1.6.10 + 17.4.16 + +