Updated to .NET 9 (#5716)

Revolutionary-Games · Nov 30, 2024 · 7057ed0 · 7057ed0
1 parent 745b7dc
commit 7057ed0
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/CIConfiguration.yml b/CIConfiguration.yml
@@ -2,7 +2,7 @@ version: 1
 
 jobs:
   build:
-    image: thrive/godot-ci:v25
+    image: thrive/godot-ci:v26
     cache:
       loadFrom:
         - v11-{Branch}-build
@@ -36,7 +36,7 @@ jobs:
           name: Upload devbuilds
           command: dotnet run --project Scripts -- upload
   jetbrains:
-    image: thrive/godot-ci:v25
+    image: thrive/godot-ci:v26
     cache:
       loadFrom:
         - v9-{Branch}-jetbrains
@@ -93,7 +93,7 @@ jobs:
                 rm -f cleanup_diff.patch
             fi
   format_test:
-    image: thrive/godot-ci:v25
+    image: thrive/godot-ci:v26
     cache:
       loadFrom:
         - v9-{Branch}-format

diff --git a/RevolutionaryGamesCommon b/RevolutionaryGamesCommon
diff --git a/Scripts/Scripts.csproj b/Scripts/Scripts.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Authors>Revolutionary Games Studio</Authors>

diff --git a/Thrive.csproj b/Thrive.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Godot.NET.Sdk/4.3.0">
   <PropertyGroup>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
     <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -56,6 +56,7 @@
     <PackageReference Include="System.Numerics.Vectors" Version="4.6.0" />
     <PackageReference Include="Nito.Collections.Deque" Version="1.2.1" />
     <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
     <PackageReference Include="XoshiroPRNG.Net" Version="1.6.0" />
     <PackageReference Include="YamlDotNet" Version="16.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />

diff --git a/ThriveScriptsShared/ThriveScriptsShared.csproj b/ThriveScriptsShared/ThriveScriptsShared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Authors>Revolutionary Games Studio</Authors>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestMinor",
-    "version": "8.0.0"
+    "version": "9.0.0"
   }
 }
diff --git a/podman/ci/Dockerfile b/podman/ci/Dockerfile
@@ -1,6 +1,6 @@
-FROM fedora:40
+FROM fedora:41
 
-RUN dnf install -y --setopt=deltarpm=false git git-lfs unzip wget dotnet-sdk-8.0 \
+RUN dnf install -y --setopt=deltarpm=false git git-lfs unzip wget dotnet-sdk-9.0 \
     gettext p7zip fontconfig && dnf clean all
 RUN git lfs install
 

diff --git a/src/auto-evo/AutoEvoRun.cs b/src/auto-evo/AutoEvoRun.cs
@@ -8,7 +8,6 @@
 using AutoEvo;
 using Godot;
 using Xoshiro.PRNG64;
-using Thread = System.Threading.Thread;
 
 /// <summary>
 ///   A single run of the auto-evo system happening in a background thread
@@ -108,7 +107,7 @@ public float CompletionFraction
         }
     }
 
-    public int CompleteSteps => Thread.VolatileRead(ref completeSteps);
+    public int CompleteSteps => Volatile.Read(ref completeSteps);
 
     public bool WasSuccessful => Finished && !Aborted;
 

diff --git a/test/code_benchmarks/CodeBenchmark.csproj b/test/code_benchmarks/CodeBenchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/test/code_tests/ThriveTest.csproj b/test/code_tests/ThriveTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>12.0</LangVersion>
     <IsPackable>false</IsPackable>

diff --git a/third_party/ThirdParty.csproj b/third_party/ThirdParty.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
+2 −2		CIConfiguration.yml
+1 −1		DevCenterCommunication.Tests/DevCenterCommunication.Tests.csproj
+1 −1		DevCenterCommunication/DevCenterCommunication.csproj
+3 −4		DevCenterCommunication/Utilities/SignedDataHandler.cs
+1 −1		FeedParser.Shared/FeedParser.Shared.csproj
+1 −1		FeedParser.Tests/FeedParser.Tests.csproj
+1 −1		FeedParser/FeedParser.csproj
+1 −1		LauncherThriveShared/LauncherThriveShared.csproj
+1 −1		Scripts/Scripts.csproj
+2 −1		ScriptsBase/ScriptsBase.csproj
+1 −1		SharedBase.Tests/SharedBase.Tests.csproj
+1 −1		SharedBase/SharedBase.csproj
+1 −1		TestUtilities/TestUtilities.csproj
+1 −1		global.json