Upgrade FreeSO to .NET 9.0

.gitignore

@@ -85,4 +85,7 @@ TSOClient/tso.client/GlobalSettings1.Designer.cs
 TSOClient/.vs/config/applicationhost.config
 *.nvuser
 
+# Rider IDE
+.idea/
+
 TSOClient/Mario

Other/libs/ColorQuantizer/SimplePaletteQuantizer/Quantizers/DistinctSelection/DistinctSelectionQuantizer.cs

@@ -129,7 +129,7 @@ protected override List<Color> OnGetPaletteToCache(Int32 colorCount)
                     ToList();
 
                 // workaround for backgrounds, the most prevalent color
-                DistinctColorInfo background = colorInfoList.MaxBy(info => info.Count);
+                DistinctColorInfo background = Enumerable.MaxBy(colorInfoList, info => info.Count);
                 colorInfoList.Remove(background);
                 colorCount--;
 

Other/libs/ColorQuantizer/SimplePaletteQuantizer/SimplePaletteQuantizer.csproj

@@ -1,194 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{37812A22-91F3-4220-891E-5C26DA64A975}</ProjectGuid>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>disable</Nullable>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SimplePaletteQuantizer</RootNamespace>
     <AssemblyName>SimplePaletteQuantizer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>Aero - Ying Yang.ico</ApplicationIcon>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <UseWindowsForms>true</UseWindowsForms>
+    <TrimMode>partial</TrimMode>
+    <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ServerRelease|AnyCPU'">
-    <OutputPath>bin\ServerRelease\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="ColorCaches\BaseColorCache.cs" />
-    <Compile Include="ColorCaches\EuclideanDistance\EuclideanDistanceColorCache.cs" />
-    <Compile Include="ColorCaches\IColorCache.cs" />
-    <Compile Include="ColorCaches\Common\ColorModel.cs" />
-    <Compile Include="ColorCaches\Octree\OctreeCacheNode.cs" />
-    <Compile Include="ColorCaches\Octree\OctreeColorCache.cs" />
-    <Compile Include="Ditherers\BaseColorDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\AtkinsonDithering.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\BaseErrorDiffusionDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\BurkesDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\FanDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\FilterLiteSierra.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\JarvisJudiceNinkeDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\ShiauDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\StuckiDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\TwoRowSierraDitherer.cs" />
-    <Compile Include="Ditherers\Ordered\BaseOrderedDitherer.cs" />
-    <Compile Include="Ditherers\Ordered\BayerDitherer4.cs" />
-    <Compile Include="Ditherers\Ordered\BayerDitherer8.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\FloydSteinbergDitherer.cs" />
-    <Compile Include="Ditherers\IColorDitherer.cs" />
-    <Compile Include="Ditherers\ErrorDiffusion\SierraDitherer.cs" />
-    <Compile Include="Ditherers\Ordered\ClusteredDotDitherer.cs" />
-    <Compile Include="Ditherers\Ordered\DotHalfToneDitherer.cs" />
-    <Compile Include="Extensions\Extend.IEnumerable.cs" />
-    <Compile Include="Extensions\Extend.Image.cs" />
-    <Compile Include="Extensions\Extend.PixelFormat.cs" />
-    <Compile Include="Helpers\ColorModelHelper.cs" />
-    <Compile Include="Helpers\FastRandom.cs" />
-    <Compile Include="Helpers\Guard.cs" />
-    <Compile Include="Helpers\ImageBuffer.cs" />
-    <Compile Include="Helpers\Pixel.cs" />
-    <Compile Include="Helpers\Pixels\INonIndexedPixel.cs" />
-    <Compile Include="Helpers\Pixels\IIndexedPixel.cs" />
-    <Compile Include="Helpers\Pixels\Indexed\PixelData1Indexed.cs" />
-    <Compile Include="Helpers\Pixels\Indexed\PixelData4Indexed.cs" />
-    <Compile Include="Helpers\Pixels\Indexed\PixelData8Indexed.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataArgb1555.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataArgb8888.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataGray16.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataRgb48.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataRgb555.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataRgb565.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataArgb64.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataRgb888.cs" />
-    <Compile Include="Helpers\Pixels\NonIndexed\PixelDataRgb8888.cs" />
-    <Compile Include="Helpers\PixelTransform.cs" />
-    <Compile Include="Helpers\QuantizationHelper.cs" />
-    <Compile Include="ColorCaches\LocalitySensitiveHash\LshBucketInfo.cs" />
-    <Compile Include="PathProviders\ReversedPathProvider.cs" />
-    <Compile Include="PathProviders\SerpentinePathProvider.cs" />
-    <Compile Include="PathProviders\StandardPathProvider.cs" />
-    <Compile Include="Quantizers\BaseColorCacheQuantizer.cs" />
-    <Compile Include="Quantizers\BaseColorQuantizer.cs" />
-    <Compile Include="Quantizers\DistinctSelection\DistinctBucket.cs" />
-    <Compile Include="Quantizers\DistinctSelection\DistinctColorInfo.cs" />
-    <Compile Include="ColorCaches\LocalitySensitiveHash\LshColorCache.cs" />
-    <Compile Include="Quantizers\IColorQuantizer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Quantizers\NeuQuant\NeuralColorQuantizer.cs" />
-    <Compile Include="Quantizers\OptimalPalette\OptimalPaletteQuantizer.cs" />
-    <Compile Include="Quantizers\XiaolinWu\WuColorCube.cs" />
-    <Compile Include="Quantizers\XiaolinWu\WuColorQuantizer.cs" />
-    <Compile Include="PathProviders\IPathProvider.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Quantizers\MedianCut\MedianCutCube.cs" />
-    <Compile Include="Quantizers\MedianCut\MedianCutQuantizer.cs" />
-    <Compile Include="Quantizers\Octree\OctreeQuantizer.cs" />
-    <Compile Include="Quantizers\Octree\OctreeNode.cs" />
-    <Compile Include="Quantizers\DistinctSelection\DistinctSelectionQuantizer.cs" />
-    <Compile Include="Quantizers\Popularity\PopularityQuantizer.cs" />
-    <Compile Include="Quantizers\Popularity\PopularityColorSlot.cs" />
-    <Compile Include="Quantizers\Uniform\UniformColorSlot.cs" />
-    <Compile Include="Quantizers\Uniform\UniformQuantizer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Aero - Ying Yang.ico" />
-  </ItemGroup>
+
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <EmbeddedResource Include="Aero - Ying Yang.ico" />
   </ItemGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
+    <PackageReference Include="System.Resources.Extensions" Version="9.0.9" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.9" />    
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>

Other/libs/MSDFData/MSDFData.csproj

@@ -1,62 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EABEA510-3E53-4F19-9F0B-75C5CA9DFA3B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>MSDFData</RootNamespace>
     <AssemblyName>MSDFData</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <PublishAot>true</PublishAot>
+    <IsAotCompatible>True</IsAotCompatible>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>link</TrimMode>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="MonoGame.Framework, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\TSOClient\packages\MonoGame.Framework.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="MonoGame.Framework.Content.Pipeline, Version=3.6.0.1625, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\TSOClient\packages\MonoGame.Framework.Content.Pipeline.Portable.3.6.0.1625\lib\portable-net45+win8+wpa81\MonoGame.Framework.Content.Pipeline.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FieldAtlas.cs" />
-    <Compile Include="FieldFont.cs" />
-    <Compile Include="FieldFontReader.cs" />
-    <Compile Include="FieldGlyph.cs" />
-    <Compile Include="FontDescription.cs" />
-    <Compile Include="KerningPair.cs" />
-    <Compile Include="Metrics.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+
+</Project>