Upgraded SRMM to .NET 10 (#18)

TheTrueColonel · web-flow · commit 0c4e88c3339a · 2025-11-13T20:30:23.000-06:00
* .NET 10 update

* Update runners
diff --git a/.github/workflows/dotnet-linux.yml b/.github/workflows/dotnet-linux.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
       - name: Restore dependancies
         run: dotnet restore
       - name: Build
diff --git a/.github/workflows/dotnet-windows.yml b/.github/workflows/dotnet-windows.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
       - name: Restore dependancies
         run: dotnet restore
       - name: Build
diff --git a/ParLibrary.Tests/ParLibrary.Tests.csproj b/ParLibrary.Tests/ParLibrary.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -12,9 +12,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+        <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
         <PackageReference Include="coverlet.collector" Version="6.0.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/ParLibrary/ParLibrary.csproj b/ParLibrary/ParLibrary.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <Configurations>Debug;Release</Configurations>
diff --git a/RyuUpdater/Program.cs b/RyuUpdater/Program.cs
@@ -30,7 +30,7 @@ private static async Task Main(string[] args) {
 
         await Task.Delay(500);
 
-        ZipFile.ExtractToDirectory(updateFile, targetDir, overwriteFiles: true);
+        await ZipFile.ExtractToDirectoryAsync(updateFile, targetDir, overwriteFiles: true);
         Directory.Delete(tempDir, recursive: true);
         
         Flags.CreateFlag(Constants.UPDATE_RECENT_FLAG_FILE_NAME);
diff --git a/RyuUpdater/RyuUpdater.csproj b/RyuUpdater/RyuUpdater.csproj
@@ -2,8 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
-        <LangVersion>12</LangVersion>
+        <LangVersion>14</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <Configurations>Debug;Release</Configurations>
@@ -16,6 +15,7 @@
         <VersionPrefix>$(AssemblyVersion)</VersionPrefix>
         <Version>$(AssemblyVersion)</Version>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+        <TargetFrameworks>net10.0;net10.0-windows</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/ShinRyuModManager-CE.sln b/ShinRyuModManager-CE.sln
diff --git a/ShinRyuModManager-CE.slnx b/ShinRyuModManager-CE.slnx
@@ -0,0 +1,18 @@
+<Solution>
+  <Configurations>
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="ParLibrary.Tests/ParLibrary.Tests.csproj">
+    <Platform Project="x64" />
+  </Project>
+  <Project Path="ParLibrary/ParLibrary.csproj">
+    <Platform Project="x64" />
+  </Project>
+  <Project Path="RyuUpdater/RyuUpdater.csproj" />
+  <Project Path="ShinRyuModManager-CE/ShinRyuModManager-CE.csproj">
+    <Platform Project="x64" />
+  </Project>
+  <Project Path="Utils/Utils.csproj">
+    <Platform Project="x64" />
+  </Project>
+</Solution>
diff --git a/ShinRyuModManager-CE/ModLoadOrder/Generator.cs b/ShinRyuModManager-CE/ModLoadOrder/Generator.cs
@@ -80,14 +80,15 @@ public static async Task<MLO> GenerateModeLoadOrder(List<string> mods, bool loos
             
             foreach (var subPath in Directory.GetDirectories(modPath)) {
                 var subPathName = new DirectoryInfo(subPath).Name;
-                
-                if (!(GamePath.DirectoryExistsInData(subPathName) || GamePath.FileExistsInData($"{subPathName}.par"))) {
-                    // While "stream" isn't a folder in Y0 or Kiwami, it shouldn't warn the user as it's used in place of bgm.cpk
-                    if (GamePath.CurrentGame is Game.Yakuza0 or Game.YakuzaKiwami && subPathName == "stream")
-                        continue;
+
+                if (GamePath.DirectoryExistsInData(subPathName) || GamePath.FileExistsInData($"{subPathName}.par"))
+                    continue;
+
+                // While "stream" isn't a folder in Y0 or Kiwami, it shouldn't warn the user as it's used in place of bgm.cpk
+                if (GamePath.CurrentGame is Game.Yakuza0 or Game.YakuzaKiwami && subPathName == "stream")
+                    continue;
                     
-                    foldersNotFound.Add(subPathName);
-                }
+                foldersNotFound.Add(subPathName);
             }
             
             if (foldersNotFound.Count != 0) {
diff --git a/ShinRyuModManager-CE/Program.cs b/ShinRyuModManager-CE/Program.cs
@@ -649,7 +649,7 @@ public static async Task InstallLibraryAsync(string guid) {
             Directory.Delete(destDir, true);
             
         Directory.CreateDirectory(destDir);
-        ZipFile.ExtractToDirectory(packagePath, destDir, true);
+        await ZipFile.ExtractToDirectoryAsync(packagePath, destDir, true);
     }
     
     private static async Task<string> DownloadLibraryPackageAsync(string fileName, LibMeta meta) {
diff --git a/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj b/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj
@@ -2,9 +2,9 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
+        <TargetFrameworks>net10.0;net10.0-windows</TargetFrameworks>
         <RootNamespace>ShinRyuModManager</RootNamespace>
-        <LangVersion>12</LangVersion>
+        <LangVersion>14</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <Configurations>Debug;Release</Configurations>
@@ -14,7 +14,7 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         
         <!-- Versioning -->
-        <AssemblyVersion>1.2.3</AssemblyVersion>
+        <AssemblyVersion>1.2.4</AssemblyVersion>
         <VersionPrefix>$(AssemblyVersion)</VersionPrefix>
         <AssemblyTitle>ShinRyuModManager-CE</AssemblyTitle>
         <Company>SRMM Studio</Company>
@@ -25,10 +25,12 @@
     
     <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
         <VersionSuffix>debug</VersionSuffix>
+        <DebugType>embedded</DebugType>
     </PropertyGroup>
     
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
         <VersionSuffix>$(BuildSuffix)</VersionSuffix>
+        <DebugType>embedded</DebugType>
         <!--<PublishTrimmed Condition="'$(SelfContained)' == 'true'">true</PublishTrimmed>-->
     </PropertyGroup>
 
@@ -54,7 +56,7 @@
         <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
         <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="6.1.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
         <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
         <PackageReference Include="SharpCompress" Version="0.41.0" />
         <PackageReference Include="Skia.Controls.Avalonia" Version="11.3.6.2" />
diff --git a/ShinRyuModManager-CE/UserInterface/Assets/changelog.md b/ShinRyuModManager-CE/UserInterface/Assets/changelog.md
@@ -1,3 +1,9 @@
+> ### **%{color:orange} Version 1.2.4 %** ###
+* Upgraded to .NET 10
+* General Cleanup
+
+---
+
 > ### **%{color:orange} Version 1.2.3 %** ###
 * Implemented changed from SRMM 4.6.6
 
diff --git a/ShinRyuModManager-CE/UserInterface/Views/ChangeLogWindow.axaml.cs b/ShinRyuModManager-CE/UserInterface/Views/ChangeLogWindow.axaml.cs
@@ -7,7 +7,7 @@ namespace ShinRyuModManager.UserInterface.Views;
 public partial class ChangeLogWindow : Window {
     public ChangeLogWindow() {
         DataContext = new ChangeLogWindowViewModel();
-        
+
         InitializeComponent();
     }
 
diff --git a/ShinRyuModManager-CE/Utils.cs b/ShinRyuModManager-CE/Utils.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Text;
 using SharpCompress.Common;
 using SharpCompress.Readers;
diff --git a/Utils/Utils.csproj b/Utils/Utils.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <Configurations>Debug;Release</Configurations>
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "10.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ public static async Task InstallLibraryAsync(string guid) {`
`649`	`649`	`Directory.Delete(destDir, true);`
`650`	`650`
`651`	`651`	`Directory.CreateDirectory(destDir);`
`652`		`- ZipFile.ExtractToDirectory(packagePath, destDir, true);`
	`652`	`+ await ZipFile.ExtractToDirectoryAsync(packagePath, destDir, true);`
`653`	`653`	`}`
`654`	`654`
`655`	`655`	`private static async Task<string> DownloadLibraryPackageAsync(string fileName, LibMeta meta) {`