Network stack update

.gitattributes

@@ -3,6 +3,7 @@
 ###############################################################################
 * text=auto
 *.ps1 eol=lf
+*.sh eol=lf
 
 ###############################################################################
 # Set default behavior for command prompt diff.

.github/workflows/build.yml

@@ -14,20 +14,20 @@ jobs:
         Game: [Ares,TS,YR]
 
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.6.0
       with:
         fetch-depth: 0
 
     - name: Setup .NET Core SDK
-      uses: actions/setup-dotnet@v3.0.3
+      uses: actions/setup-dotnet@v3.2.0
       with:
         dotnet-version: '7.x.x'
 
     - name: Build ${{matrix.Game}}
       run: ./BuildScripts/Build-${{matrix.Game}}.ps1
       shell: pwsh
 
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].2
       name: Upload Artifacts
       with:
         name: artifacts-${{matrix.Game}}

.github/workflows/pr-build-comment.yml

@@ -8,7 +8,7 @@ jobs:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/github-script@v6.3.1
+      - uses: actions/github-script@v6.4.1
         with:
           # This snippet is public-domain, taken from
           # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml

BuildScripts/Common.ps1

@@ -14,10 +14,10 @@ $EngineMap = @{
 function Build-Project($Configuration, $Game, $Engine, $Framework) {
   $Output = Join-Path $CompiledRoot $Game $Output Resources Binaries ($EngineMap[$Engine])
   if ($Engine -EQ 'WindowsXNA') {
-    dotnet publish $ProjectPath --configuration=$Configuration -property:GAME=$Game -property:ENGINE=$Engine --framework=$Framework --output=$Output --arch=x86
+    dotnet publish $ProjectPath -c $Configuration -p:GAME=$Game -p:ENGINE=$Engine -f $Framework -o $Output -p:SatelliteResourceLanguages=en -a x86
   }
   else {
-    dotnet publish $ProjectPath --configuration=$Configuration -property:GAME=$Game -property:ENGINE=$Engine --framework=$Framework --output=$Output
+    dotnet publish $ProjectPath -c $Configuration -p:GAME=$Game -p:ENGINE=$Engine -f $Framework -o $Output -p:SatelliteResourceLanguages=en
   }
   if ($LASTEXITCODE) {
     throw "Build failed for $Game $Engine $Framework $Configuration"

ClientCore/ClientConfiguration.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using ClientCore.I18N;
 using ClientCore.Extensions;
 
@@ -15,7 +15,6 @@
         private const string GENERAL = "General";
         private const string AUDIO = "Audio";
         private const string SETTINGS = "Settings";
-        private const string LINKS = "Links";
         private const string TRANSLATIONS = "Translations";
 
         private const string CLIENT_SETTINGS = "DTACnCNetClient.ini";
@@ -53,14 +52,7 @@
         /// <returns>The object of the ClientConfiguration class.</returns>
         public static ClientConfiguration Instance
         {
-            get
-            {
-                if (_instance == null)
-                {
-                    _instance = new ClientConfiguration();
-                }
-                return _instance;
-            }
+            get { return _instance ??= new ClientConfiguration(); }
         }
 
         public void RefreshSettings()
@@ -190,7 +182,7 @@
 
         public int MaximumRenderHeight => clientDefinitionsIni.GetIntValue(SETTINGS, "MaximumRenderHeight", 800);
 
         public string[] RecommendedResolutions => clientDefinitionsIni.GetStringValue(SETTINGS, "RecommendedResolutions", "1280x720,2560x1440,3840x2160").Split(',');
 
         public string WindowTitle => clientDefinitionsIni.GetStringValue(SETTINGS, "WindowTitle", string.Empty)
             .L10N("INI:ClientDefinitions:WindowTitle");
@@ -209,15 +201,15 @@
 
         public string LongGameName => clientDefinitionsIni.GetStringValue(SETTINGS, "LongGameName", "Tiberian Sun");
 
-        public string LongSupportURL => clientDefinitionsIni.GetStringValue(SETTINGS, "LongSupportURL", "http://www.moddb.com/members/rampastring");
+        public string LongSupportURL => clientDefinitionsIni.GetStringValue(SETTINGS, "LongSupportURL", $"{Uri.UriSchemeHttps}://www.moddb.com/members/rampastring");
 
         public string ShortSupportURL => clientDefinitionsIni.GetStringValue(SETTINGS, "ShortSupportURL", "www.moddb.com/members/rampastring");
 
-        public string ChangelogURL => clientDefinitionsIni.GetStringValue(SETTINGS, "ChangelogURL", "http://www.moddb.com/mods/the-dawn-of-the-tiberium-age/tutorials/change-log");
+        public string ChangelogURL => clientDefinitionsIni.GetStringValue(SETTINGS, "ChangelogURL", $"{Uri.UriSchemeHttps}://www.moddb.com/mods/the-dawn-of-the-tiberium-age/tutorials/change-log");
 
-        public string CreditsURL => clientDefinitionsIni.GetStringValue(SETTINGS, "CreditsURL", "http://www.moddb.com/mods/the-dawn-of-the-tiberium-age/tutorials/credits#Rampastring");
+        public string CreditsURL => clientDefinitionsIni.GetStringValue(SETTINGS, "CreditsURL", $"{Uri.UriSchemeHttps}://www.moddb.com/mods/the-dawn-of-the-tiberium-age/tutorials/credits#Rampastring");
 
         public string ManualDownloadURL => clientDefinitionsIni.GetStringValue(SETTINGS, "ManualDownloadURL", string.Empty);
 
         public string FinalSunIniPath => SafePath.CombineFilePath(clientDefinitionsIni.GetStringValue(SETTINGS, "FSIniPath", SafePath.CombineFilePath("FinalSun", "FinalSun.ini")));
 
@@ -400,7 +392,8 @@
     /// </summary>
     public class ClientConfigurationException : Exception
     {
-        public ClientConfigurationException(string message) : base(message)
+        public ClientConfigurationException(string message, Exception ex = null)
+            : base(message, ex)
         {
         }
     }

ClientCore/ClientCore.csproj

@@ -4,11 +4,8 @@
     <Description>CnCNet Client Core Library</Description>
     <Company>CnCNet</Company>
     <Product>CnCNet Client</Product>
-    <Copyright>Copyright © CnCNet, Rampastring 2011-2022</Copyright>
+    <Copyright>Copyright © CnCNet, Rampastring 2011-2023</Copyright>
     <Trademark>CnCNet</Trademark>
-    <Version>2.0.0.3</Version>
-    <FileVersion>2.0.0.3</FileVersion>
-    <InformationalVersion>2.0.0.3</InformationalVersion>
     <AssemblyName>ClientCore</AssemblyName>
     <RootNamespace>ClientCore</RootNamespace>
   </PropertyGroup>
@@ -46,14 +43,12 @@
     <EmbeddedResource Include="Resources\yricon.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Rampastring.Tools" Version="2.0.4" />
-    <PackageReference Include="Rampastring.XNAUI.$(Engine)" Version="2.3.8" Condition="'!$(Configuration.Contains(Debug))'" />
-    <PackageReference Include="Rampastring.XNAUI.$(Engine).Debug" Version="2.3.8" Condition="'$(Configuration.Contains(Debug))'" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+    <PackageReference Include="Rampastring.XNAUI.$(Engine)" Version="2.3.10" Condition="'!$(Configuration.Contains(Debug))'" />
+    <PackageReference Include="Rampastring.XNAUI.$(Engine).Debug" Version="2.3.10" Condition="'$(Configuration.Contains(Debug))'" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TranslationNotifierGenerator\TranslationNotifierGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />

ClientCore/CnCNet5/NameValidator.cs

@@ -21,7 +21,7 @@ public static string IsNameValid(string name)
             if (profanityFilter.IsOffensive(name))
                 return "Please enter a name that is less offensive.".L10N("Client:ClientCore:NameOffensive");
 
-            if (int.TryParse(name.Substring(0, 1), out _))
+            if (int.TryParse(name[..1], out _))
                 return "The first character in the player name cannot be a number.".L10N("Client:ClientCore:NameFirstIsNumber");
 
             if (name[0] == '-')
@@ -59,7 +59,7 @@ public static string GetValidOfflineName(string name)
             string validName = new string(name.Trim().Where(c => !disallowedCharacters.Contains(c)).ToArray());
 
             if (validName.Length > ClientConfiguration.Instance.MaxNameLength)
-                return validName.Substring(0, ClientConfiguration.Instance.MaxNameLength);
+                return validName[..ClientConfiguration.Instance.MaxNameLength];
 
             return validName;
         }

ClientCore/Extensions/EnumExtensions.cs

@@ -4,21 +4,18 @@ namespace ClientCore.Extensions
 {
     public static class EnumExtensions
     {
-        public static T Next<T>(this T src) where T : Enum
+        public static T Next<T>(this T src)
+            where T : Enum
         {
-            T[] Arr = GetValues(src);
-            int nextIndex = Array.IndexOf(Arr, src) + 1;
-            return Arr.Length == nextIndex ? Arr[0] : Arr[nextIndex];
+            T[] values = GetValues(src);
+            int nextIndex = Array.IndexOf(values, src) + 1;
+            return values.Length == nextIndex ? values[0] : values[nextIndex];
         }
 
-        public static T First<T>(this T src) where T : Enum
-        {
-            return GetValues(src)[0];
-        }
-
-        private static T[] GetValues<T>(T src) where T : Enum
+        private static T[] GetValues<T>(T src)
+            where T : Enum
         {
             return (T[])Enum.GetValues(src.GetType());
         }
     }
-}
+}

ClientCore/Extensions/StringExtensions.cs

@@ -10,16 +10,16 @@ public static string GetLink(this string text)
         if (string.IsNullOrWhiteSpace(text))
             return null;
 
-        int index = text.IndexOf("http://", StringComparison.Ordinal);
+        int index = text.IndexOf($"{Uri.UriSchemeHttp}://", StringComparison.Ordinal);
         if (index == -1)
-            index = text.IndexOf("ftp://", StringComparison.Ordinal);
+            index = text.IndexOf($"{Uri.UriSchemeFtp}://", StringComparison.Ordinal);
         if (index == -1)
-            index = text.IndexOf("https://", StringComparison.Ordinal);
+            index = text.IndexOf($"{Uri.UriSchemeHttps}://", StringComparison.Ordinal);
 
         if (index == -1)
             return null; // No link found
 
-        string link = text.Substring(index);
+        string link = text[index..];
         return link.Split(' ')[0]; // Nuke any words coming after the link
     }
 

ClientCore/Extensions/TaskExtensions.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace ClientCore.Extensions;
+
+public static class TaskExtensions
+{
+    /// <summary>
+    /// Runs a <see cref="Task"/> and guarantees all exceptions are caught and handled even when the <see cref="Task"/> is not directly awaited.
+    /// </summary>
+    /// <param name="task">The <see cref="Task"/> who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
+    /// <returns>Returns a <see cref="Task"/> that awaited and handled the original <paramref name="task"/>.</returns>
+    public static async Task HandleTask(this Task task, bool continueOnCapturedContext = false)
+    {
+        try
+        {
+            await task.ConfigureAwait(continueOnCapturedContext);
+        }
+        catch (Exception ex)
+        {
+            ProgramConstants.HandleException(ex);
+        }
+    }
+
+    /// <summary>
+    /// Runs a <see cref="Task"/> and guarantees all exceptions are caught and handled even when the <see cref="Task"/> is not directly awaited.
+    /// </summary>
+    /// <typeparam name="T">The type of <paramref name="task"/>'s return value.</typeparam>
+    /// <param name="task">The <see cref="Task"/> who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
+    /// <returns>Returns a <see cref="Task"/> that awaited and handled the original <paramref name="task"/>.</returns>
+    public static async Task<T> HandleTask<T>(this Task<T> task, bool continueOnCapturedContext = false)
+    {
+        try
+        {
+            return await task.ConfigureAwait(continueOnCapturedContext);
+        }
+        catch (Exception ex)
+        {
+            ProgramConstants.HandleException(ex);
+        }
+
+        return default;
+    }
+
+    /// <summary>
+    /// Executes a list of tasks and waits for all of them to complete and throws an <see cref="AggregateException"/> containing all exceptions from all tasks.
+    /// When using <see cref="Task.WhenAll(IEnumerable{Task})"/> only the first thrown exception from a single <see cref="Task"/> may be observed.
+    /// </summary>
+    /// <typeparam name="T">The type of <paramref name="tasks"/>'s return value.</typeparam>
+    /// <param name="tasks">The list of <see cref="Task"/>s who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
+    /// <returns>Returns a <see cref="Task"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
+    public static async Task<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks, bool continueOnCapturedContext = false)
+    {
+        var whenAllTask = Task.WhenAll(tasks);
+
+        try
+        {
+            return await whenAllTask.ConfigureAwait(continueOnCapturedContext);
+        }
+        catch
+        {
+            if (whenAllTask.Exception is null)
+                throw;
+
+            throw whenAllTask.Exception;
+        }
+    }
+
+    /// <summary>
+    /// Executes a list of tasks and waits for all of them to complete and throws an <see cref="AggregateException"/> containing all exceptions from all tasks.
+    /// When using <see cref="Task.WhenAll(IEnumerable{Task})"/> only the first thrown exception from a single <see cref="Task"/> may be observed.
+    /// </summary>
+    /// <param name="tasks">The list of <see cref="Task"/>s who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
+    /// <returns>Returns a <see cref="Task"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
+    public static async Task WhenAllSafe(IEnumerable<Task> tasks, bool continueOnCapturedContext = false)
+    {
+        var whenAllTask = Task.WhenAll(tasks);
+
+        try
+        {
+            await whenAllTask.ConfigureAwait(continueOnCapturedContext);
+        }
+        catch
+        {
+            if (whenAllTask.Exception is null)
+                throw;
+
+            throw whenAllTask.Exception;
+        }
+    }
+
+    /// <summary>
+    /// Runs a <see cref="ValueTask"/> and guarantees all exceptions are caught and handled even when the <see cref="ValueTask"/> is not directly awaited.
+    /// </summary>
+    /// <param name="task">The <see cref="ValueTask"/> who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
+    public static async void HandleTask(this ValueTask task, bool continueOnCapturedContext = false)
+    {
+        try
+        {
+            await task.ConfigureAwait(continueOnCapturedContext);
+        }
+        catch (Exception ex)
+        {
+            ProgramConstants.HandleException(ex);
+        }
+    }
+}

ClientCore/INIProcessing/PreprocessorBackgroundTask.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using ClientCore.Extensions;
 
 namespace ClientCore.INIProcessing
 {
@@ -33,7 +34,7 @@ public static PreprocessorBackgroundTask Instance
 
         public void Run()
         {
-            task = Task.Factory.StartNew(CheckFiles);
+            task = Task.Run(CheckFiles).HandleTask();
         }
 
         private static void CheckFiles()

ClientCore/ProfanityFilter.cs

@@ -80,7 +80,7 @@ private string ToRegexPattern(string wildcardSearch)
             regexPattern = regexPattern.Replace(@"\?", ".");
             if (regexPattern.StartsWith(".*?"))
             {
-                regexPattern = regexPattern.Substring(3);
+                regexPattern = regexPattern[3..];
                 regexPattern = @"(^\b)*?" + regexPattern;
             }
             regexPattern = @"\b" + regexPattern + @"\b";