bump to .net 8.0

codengine · codengine · commit 4f826119ed06 · 2025-12-29T12:06:03.000+01:00
diff --git a/.idea/.idea.cge-tools/.idea/git_toolbox_blame.xml b/.idea/.idea.cge-tools/.idea/git_toolbox_blame.xml
diff --git a/.idea/.idea.cge-tools/.idea/git_toolbox_prj.xml b/.idea/.idea.cge-tools/.idea/git_toolbox_prj.xml
diff --git a/CftConverter/CftConverter.cs b/CftConverter/CftConverter.cs
@@ -1,7 +1,10 @@
 ﻿using System.Collections;
 using System.Reflection;
 using SixLabors.Fonts;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 
 namespace CgeTools.CftConverter;
 
diff --git a/CftConverter/CftConverter.csproj b/CftConverter/CftConverter.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>CgeTools.CftConverter</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
@@ -15,8 +15,8 @@
 
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.9.1"/>
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2"/>
-        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12"/>
+        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/CftConverter/CmdLineOptions.cs b/CftConverter/CmdLineOptions.cs
@@ -1,6 +1,8 @@
 ﻿using CommandLine;
 using CommandLine.Text;
 
+#pragma warning disable CS8618
+
 namespace CgeTools.CftConverter;
 
 public class CmdLineOptions
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ A collection of tools that allows the modification (and translation) of cge/cge2
 
 ## Requirements
 
-You need to use .net 6.0 in order to use the tools provided within this repository.
+You need to use .net 8.0 in order to use the tools provided within this repository.
 
 ## Usage "cft-converter"
 
diff --git a/VbmConverter/BaseCmdLineOptions.cs b/VbmConverter/BaseCmdLineOptions.cs
@@ -1,5 +1,7 @@
 ﻿using CommandLine;
 
+#pragma warning disable CS8618
+
 namespace CgeTools.VbmConverter;
 
 public abstract class BaseCmdLineOptions
diff --git a/VbmConverter/Converter/Palette.cs b/VbmConverter/Converter/Palette.cs
@@ -1,4 +1,6 @@
-﻿namespace CgeTools.VbmConverter.Converter;
+﻿using SixLabors.ImageSharp.PixelFormats;
+
+namespace CgeTools.VbmConverter.Converter;
 
 public class Palette
 {
@@ -19,12 +21,9 @@ public Rgb24 this[int index]
 
     private static Rgb24[] ValidateColors(Rgb24[] colors)
     {
-        if (colors.Length != CountColorsPerPalette)
-        {
-            throw new ArgumentException($"Expected {CountColorsPerPalette} colors, but received {colors.Length}");
-        }
-
-        return colors;
+        return colors.Length != CountColorsPerPalette
+            ? throw new ArgumentException($"Expected {CountColorsPerPalette} colors, but received {colors.Length}")
+            : colors;
     }
 
     public void WriteToAct(string outp)
diff --git a/VbmConverter/Converter/SoltysSystemColors.cs b/VbmConverter/Converter/SoltysSystemColors.cs
@@ -1,11 +1,13 @@
-﻿namespace CgeTools.VbmConverter.Converter;
+﻿using SixLabors.ImageSharp.PixelFormats;
+
+namespace CgeTools.VbmConverter.Converter;
 
 public static class SoltysSystemColors
 {
     private static readonly Rgb24 Black = new(0, 0, 0);
 
     private static readonly Dac[] Gst =
-    {
+    [
         new() { R = 0, G = 60, B = 0 }, // 198
         new() { R = 0, G = 104, B = 0 }, // 199
         new() { R = 20, G = 172, B = 0 }, // 200
@@ -64,7 +66,7 @@ public static class SoltysSystemColors
         new() { R = 0, G = 214, B = 255 }, // 253
         new() { R = 96, G = 224, B = 96 }, // 254
         new() { R = 255, G = 255, B = 255 } // 255
-    };
+    ];
 
     public static void Modify(Palette? palette)
     {
diff --git a/VbmConverter/Converter/ToVbmConverter.cs b/VbmConverter/Converter/ToVbmConverter.cs
@@ -1,4 +1,7 @@
-﻿namespace CgeTools.VbmConverter.Converter;
+﻿using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace CgeTools.VbmConverter.Converter;
 
 // Convert images from and to .vbm files
 // The majority of this code comes from ScummVM (https://github.com/scummvm/scummvm/tree/master/engines/cge)
diff --git a/VbmConverter/Converter/Utils.cs b/VbmConverter/Converter/Utils.cs
@@ -1,4 +1,5 @@
 ﻿using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace CgeTools.VbmConverter.Converter;
 
@@ -24,7 +25,7 @@ public static void SavePaletteMap(IEnumerable<PaletteMap> paletteColors, string
         }
     }
 
-    private static IEnumerable<byte> GetBytes<T>(IEnumerable<T> elements) where T : struct
+    private static byte[] GetBytes<T>(IEnumerable<T> elements) where T : struct
     {
         var enumerable = elements as T[] ?? elements.ToArray();
         var len = enumerable.Length;
diff --git a/VbmConverter/Converter/VbmConverter.cs b/VbmConverter/Converter/VbmConverter.cs
@@ -1,4 +1,7 @@
-﻿namespace CgeTools.VbmConverter.Converter;
+﻿using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace CgeTools.VbmConverter.Converter;
 
 public static class VbmConverter
 {
@@ -112,7 +115,7 @@ private static void SaveUsedPalette(Dictionary<byte, Rgb24> usedColors, string o
         Utils.SavePaletteMap(paletteColors, outputPath);
     }
 
-    private static Palette? FindPalette(string filename, IReadOnlyDictionary<string, Palette>? paletteFiles)
+    private static Palette? FindPalette(string filename, Dictionary<string, Palette>? paletteFiles)
     {
         var fnLower = filename.ToLower();
 
@@ -230,7 +233,7 @@ private static void Validate(BaseCmdLineOptions options)
         }
     }
 
-    private static IEnumerable<string> GetFiles(BaseCmdLineOptions options, string fnPattern)
+    private static string[] GetFiles(BaseCmdLineOptions options, string fnPattern)
     {
         if (Directory.Exists(options.InputPath))
         {
@@ -241,11 +244,8 @@ private static IEnumerable<string> GetFiles(BaseCmdLineOptions options, string f
             return Directory.GetFiles(options.InputPath, fnPattern, enumerationOptions);
         }
 
-        if (File.Exists(options.InputPath))
-        {
-            return new[] { options.InputPath };
-        }
-
-        throw new ValidationException($"Given input path \"{options.InputPath}\" does not exist");
+        return File.Exists(options.InputPath)
+            ? [options.InputPath]
+            : throw new ValidationException($"Given input path \"{options.InputPath}\" does not exist");
     }
 }
diff --git a/VbmConverter/Converter/VbmFile.cs b/VbmConverter/Converter/VbmFile.cs
@@ -1,4 +1,8 @@
-﻿namespace CgeTools.VbmConverter.Converter;
+﻿using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+
+namespace CgeTools.VbmConverter.Converter;
 
 public class VbmFile
 {
@@ -99,11 +103,6 @@ private static void PutPixel(Image<Rgb24> image, int destPos, Rgb24 color)
 
     private Rgb24 GetColorFromPalette(byte colorIndex)
     {
-        if (Palette == null)
-        {
-            throw new Exception("No palette set");
-        }
-
-        return Palette[colorIndex];
+        return Palette?[colorIndex] ?? throw new Exception("No palette set");
     }
 }
diff --git a/VbmConverter/Converter/VbmReader.cs b/VbmConverter/Converter/VbmReader.cs
@@ -1,4 +1,6 @@
-﻿namespace CgeTools.VbmConverter.Converter;
+﻿using SixLabors.ImageSharp.PixelFormats;
+
+namespace CgeTools.VbmConverter.Converter;
 
 public static class VbmReader
 {
diff --git a/VbmConverter/PalettesCmdLineOptions.cs b/VbmConverter/PalettesCmdLineOptions.cs
@@ -3,7 +3,7 @@
 
 namespace CgeTools.VbmConverter;
 
-[Verb("palettes", aliases: new[] { "pal", "p" }, HelpText = "Extract palettes out of .vbm files")]
+[Verb("palettes", aliases: ["pal", "p"], HelpText = "Extract palettes out of .vbm files")]
 public class PalettesCmdLineOptions : BaseCmdLineOptions
 {
     [Usage(ApplicationAlias = "vbm-converter")]
diff --git a/VbmConverter/VbmConverter.csproj b/VbmConverter/VbmConverter.csproj
@@ -9,13 +9,13 @@
         <AssemblyVersion>1.0</AssemblyVersion>
         <FileVersion>1.0</FileVersion>
         <AssemblyName>vbm-converter</AssemblyName>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.9.1"/>
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2"/>
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12"/>
     </ItemGroup>
 
 
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
+}
