Create global.json for net9.0 (#170)

sebastienros · Nov 23, 2024 · 21dbdaf · 21dbdaf
1 parent 616ae36
commit 21dbdaf
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-[*]
+[*]
 indent_style = space
 indent_size = 2
 charset = utf-8
@@ -8,6 +8,9 @@ insert_final_newline = true
 [*.cs]
 indent_size = 4
 
+[*.md]
+trim_trailing_whitespace = false
+
 [*.cs]
 
 # IDE0022: Use block body for method

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,12 +22,10 @@ jobs:
         DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
     steps:
-    - name: Checkout source code
-      uses: actions/checkout@v4
-
+    - uses: actions/checkout@v4
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '9.0.x'
+        global-json-file: global.json
 
     - name: Test
       run: dotnet test --configuration Release
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,12 +14,10 @@ jobs:
         DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
     steps:
-    - name: Checkout source code
-      uses: actions/checkout@v4
-
+    - uses: actions/checkout@v4
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '9.0.x'
+        global-json-file: global.json
 
     - name: Test
       run: dotnet test --configuration Release

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>

diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "9.0.100",
+    "rollForward": "latestMajor"
+  }
+}
diff --git a/test/Parlot.Benchmarks/Parlot.Benchmarks.csproj b/test/Parlot.Benchmarks/Parlot.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AnalysisLevel>latest-Default</AnalysisLevel>
     <SignAssembly>False</SignAssembly>

diff --git a/test/Parlot.Tests/BenchmarksTests.cs b/test/Parlot.Tests/BenchmarksTests.cs
@@ -1,4 +1,4 @@
-#if NET8_0_OR_GREATER
+#if NET9_0_OR_GREATER
 using Parlot.Benchmarks;
 using Xunit;
 

diff --git a/test/Parlot.Tests/Parlot.Tests.csproj b/test/Parlot.Tests/Parlot.Tests.csproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\src\Samples\Samples.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <ProjectReference Include="../../test/Parlot.Benchmarks/Parlot.Benchmarks.csproj" />
   </ItemGroup>