Upgrade to C# 14 (CnCNet#877)

Author: SadPencil

ClientCore/Extensions/IniFileExtensions.cs

@@ -1,58 +1,64 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
 
 using Rampastring.Tools;
 
 namespace ClientCore.Extensions
 {
     public static class IniFileExtensions
     {
-        // Clone() method is not officially available now. https://github.com/Rampastring/Rampastring.Tools/issues/12
-        public static IniFile Clone(this IniFile oldIniFile)
+        extension(IniFile iniFile)
         {
-            var newIni = new IniFile();
-            foreach (string sectionName in oldIniFile.GetSections())
+            // Clone() method is not officially available now. https://github.com/Rampastring/Rampastring.Tools/issues/12
+            public IniFile Clone()
             {
-                IniSection oldSection = oldIniFile.GetSection(sectionName);
-                newIni.AddSection(oldSection.Clone());
-            }
-
-            return newIni;
-        }
+                var newIni = new IniFile();
+                foreach (string sectionName in iniFile.GetSections())
+                {
+                    IniSection oldSection = iniFile.GetSection(sectionName);
+                    newIni.AddSection(oldSection.Clone());
+                }
 
-        public static IniSection Clone(this IniSection oldSection)
-        {
-            IniSection newSection = new(oldSection.SectionName);
+                return newIni;
+            }
 
-            foreach ((var key, var value) in oldSection.Keys)
+            public IniSection GetOrAddSection(string sectionName)
             {
-                newSection.AddKey(key, value);
+                var section = iniFile.GetSection(sectionName);
+                if (section != null)
+                    return section;
+
+                section = new IniSection(sectionName);
+                iniFile.AddSection(section);
+                return section;
             }
 
-            return newSection;
+            public string[] GetStringListValue(string section, string key, string defaultValue, char[] separators = null)
+                => (iniFile.GetSection(section)?.GetStringValue(key, defaultValue) ?? defaultValue)
+                    .SplitWithCleanup();
+
         }
 
-        public static IniSection GetOrAddSection(this IniFile iniFile, string sectionName)
+        extension(IniSection iniSection)
         {
-            var section = iniFile.GetSection(sectionName);
-            if (section != null)
-                return section;
+            public IniSection Clone()
+            {
+                IniSection newSection = new(iniSection.SectionName);
 
-            section = new IniSection(sectionName);
-            iniFile.AddSection(section);
-            return section;
-        }
+                foreach ((var key, var value) in iniSection.Keys)
+                {
+                    newSection.AddKey(key, value);
+                }
 
-        public static void RemoveAllKeys(this IniSection iniSection)
-        {
-            var keys = new List<KeyValuePair<string, string>>(iniSection.Keys);
-            foreach (KeyValuePair<string, string> iniSectionKey in keys)
-                iniSection.RemoveKey(iniSectionKey.Key);
-        }
+                return newSection;
+            }
 
-        public static string[] GetStringListValue(this IniFile iniFile, string section, string key, string defaultValue, char[] separators = null)
-            => (iniFile.GetSection(section)?.GetStringValue(key, defaultValue) ?? defaultValue)
-                .SplitWithCleanup();
+            public void RemoveAllKeys()
+            {
+                var keys = new List<KeyValuePair<string, string>>(iniSection.Keys);
+                foreach (KeyValuePair<string, string> iniSectionKey in keys)
+                    iniSection.RemoveKey(iniSectionKey.Key);
+            }
+        }
     }
 }

DXClient.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32408.312
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11217.181
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DXMainClient", "DXMainClient\DXMainClient.csproj", "{97458C1E-2E6C-4C5C-93C7-16A6712802E9}"
 EndProject

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>14.0</LangVersion>
     <ComVisible>false</ComVisible>
     <CLSCompliant>false</CLSCompliant>
     <ImplicitUsings>disable</ImplicitUsings>

README.md

@@ -27,13 +27,13 @@ To build this project, you must use Git to clone the repository, instead of down
 git submodule update --init --recursive
 ```
 
-Building the solution for **any** platform requires Visual Studio 2022 17.8 or newer and/or the .NET SDK 8.0.200. A modern version of Visual Studio Code, MonoDevelop or Visual Studio for Mac could also work, but are not officially supported.
-To debug WindowsXNA builds the .NET SDK 8.0 x86 is additionally required.
+Building the solution for **any** platform requires the .NET SDK 10.0.100. Editing the source code requires Visual Studio 2026 or newer, or Rider 2025.3 or newer. A modern version of Visual Studio Code also works, but is not officially supported.
+To debug WindowsXNA builds the .NET SDK 10.0 x86 is additionally required.
 When using the included build scripts PowerShell 7.2 or newer is required.[^install-powershell]
 
 ## Compiling and debugging
 
-* Compiling itself is simple: assuming you have the .NET 8.0 SDK installed, you can just open the solution with Visual Studio and compile it right away.
+* Compiling itself is simple: assuming you have the .NET SDK 10.0 installed, you can just open the solution with Visual Studio and compile it right away.
 * When built as a debug build, the client executable expects to reside in the same directory with the target project's main game executable. Resources should exist in a "Resources" sub-directory in the same directory. The repository contains sample resources and post-build commands for copying them so that you can immediately run the client in debug mode by just hitting the Debug button in Visual Studio.
 * When built in release mode, the client executables expect to reside in the `Resources` sub-directory itself for .NET 4.8, named `clientdx.exe`, `clientogl.exe` and `clientxna.exe`. Each `.exe` file or `.dll` file expects a `.pdb` file for diagnostics purpose. It's advised not to delete these `.pdb` files. Keep all `.pdb` files even for end users.
 * The `Scripts` directory has automated build scripts that build the client for all platforms and copy the output files to a folder named `Compiled` in the project root. You can then copy the contents of this `Compiled` directory into the `Resources` sub-directory of any target project.
@@ -89,7 +89,7 @@ Refer to [Docs/Build.md](/Docs/Build.md) for more information about building the
 * [.NET 8.0 Desktop Runtime x86](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.0-windows-x86-installer).
 
 Windows 7 SP1 and Windows 8.x additionally require:
-* Microsoft Visual C++ 2015-2019 Redistributable [64-bit](https://aka.ms/vs/16/release/vc_redist.x64.exe) / [32-bit](https://aka.ms/vs/16/release/vc_redist.x86.exe).
+* Microsoft Visual C++ 2015-2019 Redistributable [64-bit](https://aka.ms/vs/16/release/vc_redist.x64.exe) / [32-bit](https://aka.ms/vs/16/release/vc_redist.x86.exe). Note: the latest version of this redistributable is named "Microsoft Visual C++ 2015-2026 Redistributable", available [here](https://learn.microsoft.com/cpp/windows/latest-supported-vc-redist). We recommend using the latest version instead of the 2015-2019 version.
 
 Windows 7 SP1 additionally requires:
 * KB3063858 [64-bit](https://www.microsoft.com/download/details.aspx?id=47442) / [32-bit](https://www.microsoft.com/download/details.aspx?id=47409).

Scripts/build.ps1

@@ -112,9 +112,9 @@ function Script:Invoke-BuildProject {
       #   $Private:ArgumentList.Add('--arch=x86')
       # }
 
-      & 'dotnet' $Private:ArgumentList  
+      & 'dotnet' $Private:ArgumentList
       if ($LASTEXITCODE) {
-        throw "Build failed for ${Engine}$Script:ConfigurationSuffix $Framework"
+        throw "Build failed for ${Engine}$Script:ConfigurationSuffix $Framework (exit code $LASTEXITCODE)"
       }
     }
     else {

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestFeature",
-    "version": "8.0.200"
+    "version": "10.0.100"
   }
 }