Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ParLibrary.Tests/ParLibrary.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ParLibrary/ParLibrary.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion RyuUpdater/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions RyuUpdater/RyuUpdater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -16,6 +15,7 @@
<VersionPrefix>$(AssemblyVersion)</VersionPrefix>
<Version>$(AssemblyVersion)</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<TargetFrameworks>net10.0;net10.0-windows</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
40 changes: 0 additions & 40 deletions ShinRyuModManager-CE.sln

This file was deleted.

18 changes: 18 additions & 0 deletions ShinRyuModManager-CE.slnx
Original file line number Diff line number Diff line change
@@ -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>
15 changes: 8 additions & 7 deletions ShinRyuModManager-CE/ModLoadOrder/Generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ShinRyuModManager-CE/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 6 additions & 4 deletions ShinRyuModManager-CE/ShinRyuModManager-CE.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>

Expand All @@ -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" />
Expand Down
6 changes: 6 additions & 0 deletions ShinRyuModManager-CE/UserInterface/Assets/changelog.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace ShinRyuModManager.UserInterface.Views;
public partial class ChangeLogWindow : Window {
public ChangeLogWindow() {
DataContext = new ChangeLogWindowViewModel();

InitializeComponent();
}

Expand Down
1 change: 0 additions & 1 deletion ShinRyuModManager-CE/Utils.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Reflection;
using System.Text;
using SharpCompress.Common;
using SharpCompress.Readers;
Expand Down
2 changes: 1 addition & 1 deletion Utils/Utils.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "8.0.0",
"version": "10.0.0",
"rollForward": "latestMinor",
"allowPrerelease": false
}
}
}