mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add patches for format repo

Browse source
This commit is contained in:
Matt Thalman 2023-10-18 13:09:53 -05:00
parent 5f31c079f2
commit d2a2a2ac45
2 changed files with 74 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch Normal file
View file

@ -0,0 +1,51 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCurrent)</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<Optimize>true</Optimize>
<Configuration>Release</Configuration>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCurrent)</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.Tools</RootNamespace>
<ServerGarbageCollection>true</ServerGarbageCollection>
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 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>$(NetCurrent)</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<RootNamespace>Microsoft.CodeAnalysis.Tools.Tests</RootNamespace>
<!-- Copy nuget assemblies to build directory so that Microsoft.CodeAnalysis.Features.* can be located when running tests. -->

23
src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch Normal file
View file

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
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 @@
<!-- external -->
<BenchmarkDotNetVersion>0.13.5</BenchmarkDotNetVersion>
<BenchmarkDotNetAnnotationsVersion>0.13.5</BenchmarkDotNetAnnotationsVersion>
- <MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
+ <MicrosoftBuildLocatorVersion>1.6.10</MicrosoftBuildLocatorVersion>
<MicrosoftVisua>17.4.16</MicrosoftVisualStudioCompositionVersion>
</PropertyGroup>
</Project>