From 2385c3da78308709ab4ac903c079c75b9626637d Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 13 Nov 2025 20:26:50 -0600 Subject: [PATCH 1/2] .NET 10 update --- ParLibrary.Tests/ParLibrary.Tests.csproj | 8 ++-- ParLibrary/ParLibrary.csproj | 2 +- RyuUpdater/Program.cs | 2 +- RyuUpdater/RyuUpdater.csproj | 4 +- ShinRyuModManager-CE.sln | 40 ------------------- ShinRyuModManager-CE.slnx | 18 +++++++++ .../ModLoadOrder/Generator.cs | 15 +++---- ShinRyuModManager-CE/Program.cs | 2 +- .../ShinRyuModManager-CE.csproj | 10 +++-- .../UserInterface/Assets/changelog.md | 6 +++ .../Views/ChangeLogWindow.axaml.cs | 2 +- ShinRyuModManager-CE/Utils.cs | 1 - Utils/Utils.csproj | 2 +- global.json | 4 +- 14 files changed, 51 insertions(+), 65 deletions(-) delete mode 100644 ShinRyuModManager-CE.sln create mode 100644 ShinRyuModManager-CE.slnx diff --git a/ParLibrary.Tests/ParLibrary.Tests.csproj b/ParLibrary.Tests/ParLibrary.Tests.csproj index d5b3f54..0013197 100644 --- a/ParLibrary.Tests/ParLibrary.Tests.csproj +++ b/ParLibrary.Tests/ParLibrary.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -12,9 +12,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ParLibrary/ParLibrary.csproj b/ParLibrary/ParLibrary.csproj index bc9384b..c51de85 100644 --- a/ParLibrary/ParLibrary.csproj +++ b/ParLibrary/ParLibrary.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable disable Debug;Release diff --git a/RyuUpdater/Program.cs b/RyuUpdater/Program.cs index 17dd86c..df642c3 100644 --- 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 index 29418c4..d1d23b8 100644 --- a/RyuUpdater/RyuUpdater.csproj +++ b/RyuUpdater/RyuUpdater.csproj @@ -2,8 +2,7 @@ Exe - net8.0;net8.0-windows - 12 + 14 enable disable Debug;Release @@ -16,6 +15,7 @@ $(AssemblyVersion) $(AssemblyVersion) false + net10.0;net10.0-windows diff --git a/ShinRyuModManager-CE.sln b/ShinRyuModManager-CE.sln deleted file mode 100644 index 75f2815..0000000 --- a/ShinRyuModManager-CE.sln +++ /dev/null @@ -1,40 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShinRyuModManager-CE", "ShinRyuModManager-CE\ShinRyuModManager-CE.csproj", "{6D3C8A4B-5CA2-4929-B575-18E7AE18FA99}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParLibrary", "ParLibrary\ParLibrary.csproj", "{B8691802-6EBC-4C1B-A2A3-87C8F2973F6B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParLibrary.Tests", "ParLibrary.Tests\ParLibrary.Tests.csproj", "{B1731DF3-ABFB-45DE-93C8-C1DC2D2CEFC5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils.csproj", "{7F2462E1-FB0A-4BFA-BBF9-91CD9DB1FC56}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RyuUpdater", "RyuUpdater\RyuUpdater.csproj", "{FDE3D69A-37FA-4187-9CAE-07EA4382D8A6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B8691802-6EBC-4C1B-A2A3-87C8F2973F6B}.Debug|x64.ActiveCfg = Debug|x64 - {B8691802-6EBC-4C1B-A2A3-87C8F2973F6B}.Debug|x64.Build.0 = Debug|x64 - {B8691802-6EBC-4C1B-A2A3-87C8F2973F6B}.Release|x64.ActiveCfg = Release|x64 - {B8691802-6EBC-4C1B-A2A3-87C8F2973F6B}.Release|x64.Build.0 = Release|x64 - {B1731DF3-ABFB-45DE-93C8-C1DC2D2CEFC5}.Debug|x64.ActiveCfg = Debug|x64 - {B1731DF3-ABFB-45DE-93C8-C1DC2D2CEFC5}.Debug|x64.Build.0 = Debug|x64 - {B1731DF3-ABFB-45DE-93C8-C1DC2D2CEFC5}.Release|x64.ActiveCfg = Release|x64 - {B1731DF3-ABFB-45DE-93C8-C1DC2D2CEFC5}.Release|x64.Build.0 = Release|x64 - {6D3C8A4B-5CA2-4929-B575-18E7AE18FA99}.Debug|x64.ActiveCfg = Debug|x64 - {6D3C8A4B-5CA2-4929-B575-18E7AE18FA99}.Debug|x64.Build.0 = Debug|x64 - {6D3C8A4B-5CA2-4929-B575-18E7AE18FA99}.Release|x64.ActiveCfg = Release|x64 - {6D3C8A4B-5CA2-4929-B575-18E7AE18FA99}.Release|x64.Build.0 = Release|x64 - {7F2462E1-FB0A-4BFA-BBF9-91CD9DB1FC56}.Debug|x64.ActiveCfg = Debug|x64 - {7F2462E1-FB0A-4BFA-BBF9-91CD9DB1FC56}.Debug|x64.Build.0 = Debug|x64 - {7F2462E1-FB0A-4BFA-BBF9-91CD9DB1FC56}.Release|x64.ActiveCfg = Release|x64 - {7F2462E1-FB0A-4BFA-BBF9-91CD9DB1FC56}.Release|x64.Build.0 = Release|x64 - {FDE3D69A-37FA-4187-9CAE-07EA4382D8A6}.Debug|x64.ActiveCfg = Debug|Any CPU - {FDE3D69A-37FA-4187-9CAE-07EA4382D8A6}.Debug|x64.Build.0 = Debug|Any CPU - {FDE3D69A-37FA-4187-9CAE-07EA4382D8A6}.Release|x64.ActiveCfg = Release|Any CPU - {FDE3D69A-37FA-4187-9CAE-07EA4382D8A6}.Release|x64.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/ShinRyuModManager-CE.slnx b/ShinRyuModManager-CE.slnx new file mode 100644 index 0000000..7bf0218 --- /dev/null +++ b/ShinRyuModManager-CE.slnx @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/ShinRyuModManager-CE/ModLoadOrder/Generator.cs b/ShinRyuModManager-CE/ModLoadOrder/Generator.cs index 0388078..ed5b3b7 100644 --- a/ShinRyuModManager-CE/ModLoadOrder/Generator.cs +++ b/ShinRyuModManager-CE/ModLoadOrder/Generator.cs @@ -80,14 +80,15 @@ public static async Task GenerateModeLoadOrder(List 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 index 19cb89d..a2ac3dc 100644 --- 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 DownloadLibraryPackageAsync(string fileName, LibMeta meta) { diff --git a/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj b/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj index ddc1e64..c23299a 100644 --- a/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj +++ b/ShinRyuModManager-CE/ShinRyuModManager-CE.csproj @@ -2,9 +2,9 @@ WinExe - net8.0;net8.0-windows + net10.0;net10.0-windows ShinRyuModManager - 12 + 14 enable disable Debug;Release @@ -14,7 +14,7 @@ true - 1.2.3 + 1.2.4 $(AssemblyVersion) ShinRyuModManager-CE SRMM Studio @@ -25,10 +25,12 @@ debug + embedded $(BuildSuffix) + embedded @@ -54,7 +56,7 @@ - + diff --git a/ShinRyuModManager-CE/UserInterface/Assets/changelog.md b/ShinRyuModManager-CE/UserInterface/Assets/changelog.md index 6f4d012..0d8da9d 100644 --- 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 index 7fb653e..0afb92a 100644 --- 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 index 5d9faea..379b169 100644 --- 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 index 50f6c7a..b30b269 100644 --- a/Utils/Utils.csproj +++ b/Utils/Utils.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable disable Debug;Release diff --git a/global.json b/global.json index 18b689d..90e5a42 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.0", + "version": "10.0.0", "rollForward": "latestMinor", "allowPrerelease": false } -} +} \ No newline at end of file From 70e17faafe0395f661e40d0708a867aa629d8061 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 13 Nov 2025 20:27:39 -0600 Subject: [PATCH 2/2] Update runners --- .github/workflows/dotnet-linux.yml | 2 +- .github/workflows/dotnet-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-linux.yml b/.github/workflows/dotnet-linux.yml index bb802bb..dbeee38 100644 --- 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 index 217f6b8..7bad710 100644 --- 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