diff --git a/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj b/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj index 7b32847..4cd2ed6 100644 --- a/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj +++ b/AssetStudio.PInvoke/AssetStudio.PInvoke.csproj @@ -1,8 +1,7 @@ - net7.0;net6.0 - true + net6.0;net7.0 0.80.30 0.80.30 0.80.30 diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj index f55611e..d3a981b 100644 --- a/AssetStudio/AssetStudio.csproj +++ b/AssetStudio/AssetStudio.csproj @@ -1,7 +1,7 @@ - net7.0;net6.0 + net6.0;net7.0 0.80.30 0.80.30 0.80.30 diff --git a/AssetStudio/Keys.json b/AssetStudio/Keys.json index f82ed94..148a104 100644 --- a/AssetStudio/Keys.json +++ b/AssetStudio/Keys.json @@ -34,5 +34,9 @@ { "Name": "Castlevania: Moon Night Fantasy", "Key": "1234567812345678" + }, + { + "Name": "Huā Yì Shān Xīn Zhī Yuè", + "Key": "INHJnhdypqk547xd" } ] \ No newline at end of file diff --git a/AssetStudioCLI/AssetStudioCLI.csproj b/AssetStudioCLI/AssetStudioCLI.csproj index 8128480..a07a7d7 100644 --- a/AssetStudioCLI/AssetStudioCLI.csproj +++ b/AssetStudioCLI/AssetStudioCLI.csproj @@ -1,7 +1,7 @@  Exe - net7.0-windows;net6.0-windows + net6.0-windows;net7.0-windows Resources\as.ico 0.80.30 0.80.30 diff --git a/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj b/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj index d4856ad..b4dec47 100644 --- a/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj +++ b/AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj @@ -1,7 +1,7 @@ - net7.0;net6.0 + net6.0;net7.0 true 0.80.30 0.80.30 diff --git a/AssetStudioGUI/AssetStudioGUI.csproj b/AssetStudioGUI/AssetStudioGUI.csproj index c56d395..cb23992 100644 --- a/AssetStudioGUI/AssetStudioGUI.csproj +++ b/AssetStudioGUI/AssetStudioGUI.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows;net6.0-windows + net6.0-windows;net7.0-windows true Resources\as.ico 0.80.30 diff --git a/AssetStudioUtility/AssetStudioUtility.csproj b/AssetStudioUtility/AssetStudioUtility.csproj index b6986e8..710d209 100644 --- a/AssetStudioUtility/AssetStudioUtility.csproj +++ b/AssetStudioUtility/AssetStudioUtility.csproj @@ -1,7 +1,7 @@ - net7.0;net6.0 + net6.0;net7.0 0.80.30 0.80.30 0.80.30 diff --git a/appveyor.yml b/appveyor.yml index d7959df..6ef6efd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,8 @@ install: - pwsh: appveyor DownloadFile $env:FBX_SDK && Start (Get-ChildItem ./'fbx*'.exe -Name) /S -Wait build_script: - - msbuild -m -t:AssetStudioGUI:publish -t:AssetStudioCLI:publish -r -p:Configuration=Release -v:minimal AssetStudio.sln + - msbuild -m -t:AssetStudioGUI:publish -t:AssetStudioCLI:publish -r -p:Configuration=Release -p:TargetFramework=net6.0-windows -v:minimal AssetStudio.sln + - msbuild -m -t:AssetStudioGUI:publish -t:AssetStudioCLI:publish -r -p:Configuration=Release -p:TargetFramework=net7.0-windows -v:minimal AssetStudio.sln after_build: - 7z a -y -mx9 net6.0-windows.zip %APPVEYOR_BUILD_FOLDER%\AssetStudioGUI\bin\Release\net6.0-windows\publish\