Updated to .NET 8

CIConfiguration.yml

@@ -2,19 +2,19 @@ version: 1
 
 jobs:
   build:
-    image: thrive/godot-ci:v21
+    image: thrive/godot-ci:v22
     cache:
       loadFrom:
-        - v8-{Branch}-build
-        - v8-master-build
-      writeTo: v8-{Branch}-build
+        - v9-{Branch}-build
+        - v9-master-build
+      writeTo: v9-{Branch}-build
       shared:
-        .git/lfs: v5-lfs
-        .import: v9-import
-        builds: v4-builds
+        .git/lfs: v6-lfs
+        .import: v10-import
+        builds: v5-builds
         native_libs: v1-native
       system:
-        /root/.nuget: v4-nuget
+        /root/.nuget: v5-nuget
     steps:
       - run:
           name: Make project valid for compile
@@ -34,18 +34,18 @@ jobs:
           name: Upload devbuilds
           command: dotnet run --project Scripts -- upload
   jetbrains:
-    image: thrive/godot-ci:v21
+    image: thrive/godot-ci:v22
     cache:
       loadFrom:
-        - v5-{Branch}-jetbrains
-        - v5-master-jetbrains
-      writeTo: v5-{Branch}-jetbrains
+        - v6-{Branch}-jetbrains
+        - v6-master-jetbrains
+      writeTo: v6-{Branch}-jetbrains
       shared:
-        .git/lfs: v5-lfs
-        .import: v9-import
-        builds: v4-jetbrains-dummy-builds
+        .git/lfs: v6-lfs
+        .import: v10-import
+        builds: v5-jetbrains-dummy-builds
       system:
-        /root/.nuget: v4-nuget
+        /root/.nuget: v5-nuget
     artifacts:
       paths:
         - files_to_check.txt
@@ -95,16 +95,16 @@ jobs:
                 rm -f cleanup_diff.patch
             fi
   format_script:
-    image: thrive/godot-ci:v21
+    image: thrive/godot-ci:v22
     cache:
       loadFrom:
-        - v5-{Branch}-format
-        - v5-master-format
-      writeTo: v5-{Branch}-format
+        - v6-{Branch}-format
+        - v6-master-format
+      writeTo: v6-{Branch}-format
       shared:
-        .git/lfs: v5-lfs
+        .git/lfs: v6-lfs
       system:
-        /root/.nuget: v4-nuget
+        /root/.nuget: v5-nuget
     artifacts:
       paths:
         - format_diff.patch

Scripts/Program.cs

@@ -273,9 +273,7 @@ private static int RunProjectValidMaker(GodotProjectValidMakerOptions options)
         return tool.Run(tokenSource.Token).Result;
     }
 
-    public class CheckOptions : CheckOptionsBase
-    {
-    }
+    public class CheckOptions : CheckOptionsBase;
 
     [Verb("native", HelpText = "Handling for native libraries needed by Thrive")]
     public class NativeLibOptions : SymbolUploadOptionsBase
@@ -374,19 +372,15 @@ public static IEnumerable<Example> Examples
     }
 
     [Verb("test", HelpText = "Run tests using 'dotnet' command")]
-    public class TestOptions : ScriptOptionsBase
-    {
-    }
+    public class TestOptions : ScriptOptionsBase;
 
     public class ChangesOptions : ChangesOptionsBase
     {
         [Option('b', "branch", Required = false, Default = "master", HelpText = "The git remote branch name")]
         public override string RemoteBranch { get; set; } = "master";
     }
 
-    public class LocalizationOptions : LocalizationOptionsBase
-    {
-    }
+    public class LocalizationOptions : LocalizationOptionsBase;
 
     [Verb("cleanup", HelpText = "Cleanup Godot temporary files. WARNING: will lose uncommitted changes")]
     public class CleanupOptions : ScriptOptionsBase
@@ -456,24 +450,16 @@ public class SteamOptions : ScriptOptionsBase
     }
 
     [Verb("godot-templates", HelpText = "Tool to automatically install Godot templates")]
-    public class GodotTemplateOptions : ScriptOptionsBase
-    {
-    }
+    public class GodotTemplateOptions : ScriptOptionsBase;
 
     [Verb("translation-progress", HelpText = "Updates the translation progress file")]
-    public class TranslationProgressOptions : ScriptOptionsBase
-    {
-    }
+    public class TranslationProgressOptions : ScriptOptionsBase;
 
     [Verb("credits", HelpText = "Updates credits with some automatically (and some needing manual) retrieved files")]
-    public class CreditsOptions : ScriptOptionsBase
-    {
-    }
+    public class CreditsOptions : ScriptOptionsBase;
 
     [Verb("wiki", HelpText = "Updates the Thriveopedia with content from the online wiki")]
-    public class WikiOptions : ScriptOptionsBase
-    {
-    }
+    public class WikiOptions : ScriptOptionsBase;
 
     [Verb("generate", HelpText = "Generates various kinds of files")]
     public class GeneratorOptions : ScriptOptionsBase
@@ -484,7 +470,5 @@ public class GeneratorOptions : ScriptOptionsBase
     }
 
     [Verb("make-project-valid", HelpText = "Makes the Godot project valid for C# compile")]
-    public class GodotProjectValidMakerOptions : ScriptOptionsBase
-    {
-    }
+    public class GodotProjectValidMakerOptions : ScriptOptionsBase;
 }

Scripts/Scripts.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Authors>Revolutionary Games Studio</Authors>

Scripts/Uploader.cs

@@ -523,7 +523,5 @@ public ThingToUpload(string file, string uploadUrl, string verifyToken, bool del
         public string? ExtraDelete { get; init; }
     }
 
-    private class DevBuildOverwriteFailedException : Exception
-    {
-    }
+    private class DevBuildOverwriteFailedException : Exception;
 }

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestMinor",
-    "version": "7.0.0"
+    "version": "8.0.0"
   }
 }

podman/ci/Dockerfile

@@ -1,6 +1,6 @@
-FROM fedora:37
+FROM fedora:39
 
-RUN dnf install -y --setopt=deltarpm=false git git-lfs unzip wget dotnet-sdk-7.0 \
+RUN dnf install -y --setopt=deltarpm=false git git-lfs unzip wget dotnet-sdk-8.0 \
     gettext p7zip && dnf clean all
 RUN git lfs install
 
@@ -26,7 +26,7 @@ RUN wget https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}/mono/Godot
 COPY editor_settings-3.tres /root/.config/godot/editor_settings-3.tres
 
 # Godot pck tool
-ENV PCK_TOOL_VERSION "v1.8"
+ENV PCK_TOOL_VERSION "v1.9"
 
 RUN wget https://github.com/hhyyrylainen/GodotPckTool/releases/download/${PCK_TOOL_VERSION}/godotpcktool -O /usr/bin/godotpcktool && \
     chmod +x /usr/bin/godotpcktool