diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 591a06266..aebb4bd7a 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -35,20 +35,6 @@ jobs: with: nsis-version: '3.10' - - name: Install .NET Framework 4.6.1 - shell: powershell - run: | - # Download the .NET Framework 4.6.1 installer - $url = "https://go.microsoft.com/fwlink/?linkid=2099470" - $outputPath = "$env:TEMP\dotnet461-installer.exe" - Invoke-WebRequest -Uri "$url" -OutFile "$outputPath" - - # Install silently - Start-Process -FilePath $outputPath -ArgumentList "/quiet", "/norestart" -Wait - - # Clean up the installer - Remove-Item -Path $outputPath - - name: Set up .NET Core SDK 3.0 uses: actions/setup-dotnet@v4 with: @@ -70,25 +56,22 @@ jobs: Set-Content -Path "${{ github.workspace }}\hakchi_gui\ApiKeys\TheGamesDB.txt" -Value $env:GamesDBApiKey -NoNewLine env: GamesDBApiKey: ${{ secrets.GAMESDB_API_KEY }} - + - name: Build solution run: | msbuild "Installer/Installer.vcxproj" /p:SolutionDir="${{ github.workspace }}\" /p:SolutionPath="${{ github.workspace }}\${{ env.solution }}" "/p:Platform=${{ env.buildPlatform }}" - name: Run Hakchi Version Script run: | - $exePath = "${{ github.workspace }}\hakchi_gui\bin\Debug\net461\hakchi.exe" - $versionPath = "${{ github.workspace }}\displayVersion.txt" - & $exePath --versionFormat "{0}" --versionFile "$versionPath" - $version = Get-Content -Path $versionPath | Out-String - Remove-Item -Path $versionPath + $version = & "${{ github.workspace }}\hakchi_gui\bin\Debug\net48\hakchi.exe" --versionFormat "{0}" Add-Content -Path $ENV:GITHUB_ENV -Value "displayVersion=$version" + Write-Output $version - name: Upload Artifacts (Portable) uses: actions/upload-artifact@v4 with: name: hakchi2-ce-${{ env.displayVersion }}-portable - path: ${{ github.workspace }}\hakchi_gui\bin\Debug\net461\ + path: ${{ github.workspace }}\hakchi_gui\bin\Debug\net48\ - name: Upload Artifacts (Installer) uses: actions/upload-artifact@v4 diff --git a/.gitmodules b/.gitmodules index 33f80c970..42ac7548a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ +[submodule "driver/source"] + path = driver/source + url = https://github.com/TeamShinkansen/libwdi.git [submodule "Libraries/SSH.NET"] path = Libraries/SSH.NET url = https://github.com/TeamShinkansen/SSH.NET.git @@ -7,7 +10,7 @@ url = https://github.com/TeamShinkansen/ProgressODoom.git [submodule "Libraries/tiny7z"] path = Libraries/tiny7z - url = https://github.com/daPhie79/tiny7z.git + url = https://github.com/TeamShinkansen/tiny7z.git [submodule "Libraries/LibUsbDotNet"] path = Libraries/LibUsbDotNet url = https://github.com/TeamShinkansen/LibUsbDotNet.git diff --git a/Installer/Installer.vcxproj b/Installer/Installer.vcxproj index ceb6af9d6..647708304 100644 --- a/Installer/Installer.vcxproj +++ b/Installer/Installer.vcxproj @@ -67,12 +67,12 @@ msbuild.exe "$(SolutionDir)NSI\nsi-helper\nsi-helper.csproj" /p:Configuration=Release msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release -del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461" -rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461" +del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48" +rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48" msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui -"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh" +"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)NSI\debug-uninstall.nsh" makensis.exe "$(SolutionDir)NSI\Installer.nsi" @@ -80,12 +80,12 @@ del "$(SolutionDir)NSI\debug-uninstall.nsh" msbuild.exe "$(SolutionDir)NSI\nsi-helper\nsi-helper.csproj" /p:Configuration=Release msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release -del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461" -rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461" +del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48" +rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48" msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui -"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh" +"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)NSI\debug-uninstall.nsh" makensis.exe "$(SolutionDir)NSI\Installer.nsi" diff --git a/Libraries/CueSharp b/Libraries/CueSharp index 95c8effb0..59c0e84d9 160000 --- a/Libraries/CueSharp +++ b/Libraries/CueSharp @@ -1 +1 @@ -Subproject commit 95c8effb03c959b1ad1382886d03dce984f461f7 +Subproject commit 59c0e84d9a4629f9fe301859bff09cbc98950a1a diff --git a/Libraries/ProgressODoom b/Libraries/ProgressODoom index 9f1b816f0..5eda7fcdd 160000 --- a/Libraries/ProgressODoom +++ b/Libraries/ProgressODoom @@ -1 +1 @@ -Subproject commit 9f1b816f0ec1d221233ba3a96cad67e7fea8d62f +Subproject commit 5eda7fcdddd9561a209240fd7a81d5092f34364d diff --git a/Libraries/SSH.NET b/Libraries/SSH.NET index 3606c4952..9fb951d6b 160000 --- a/Libraries/SSH.NET +++ b/Libraries/SSH.NET @@ -1 +1 @@ -Subproject commit 3606c49529fb2fcd65384e50c46a718998ecd9c1 +Subproject commit 9fb951d6b5027add14cf4f9707f84c8614f1cd68 diff --git a/Libraries/SpineGen b/Libraries/SpineGen index caf7b0cbd..9018bb866 160000 --- a/Libraries/SpineGen +++ b/Libraries/SpineGen @@ -1 +1 @@ -Subproject commit caf7b0cbd8ba44127fcb575e6bb6e10163bc62be +Subproject commit 9018bb866402cce72b955e68cab9e90271a28a9e diff --git a/Libraries/tiny7z b/Libraries/tiny7z index b529c11a2..de76b8e96 160000 --- a/Libraries/tiny7z +++ b/Libraries/tiny7z @@ -1 +1 @@ -Subproject commit b529c11a2a0e7be3e0dd7adab359770d1648fb5e +Subproject commit de76b8e962ae4161f153f156c24383d2c423a83f diff --git a/NSI/Installer.nsi b/NSI/Installer.nsi index 4981409ee..6d3b73e9a 100644 --- a/NSI/Installer.nsi +++ b/NSI/Installer.nsi @@ -3,12 +3,12 @@ !include "FileFunc.nsh" ; Display Version -!system '..\hakchi_gui\bin\Debug\net461\hakchi.exe --versionFormat "!define DisplayVersion {0}" --versionFile version.nsh' +!system '..\hakchi_gui\bin\Debug\net48\hakchi.exe --versionFormat "!define DisplayVersion {0}" --versionFile version.nsh' !include ".\version.nsh" !system 'del version.nsh' ; Create zip files -!system '..\Zipper\bin\Release\Zipper.exe ..\hakchi_gui\bin\Debug\net461 ..\hakchi_gui\bin\hakchi2-ce-${DisplayVersion}-portable.zip' +!system '..\Zipper\bin\Release\Zipper.exe ..\hakchi_gui\bin\Debug\net48 ..\hakchi_gui\bin\hakchi2-ce-${DisplayVersion}-portable.zip' ; The icon of the installer Icon "..\hakchi_gui\icon_app.ico" @@ -73,7 +73,7 @@ SectionEnd Section "Hakchi2 CE ${DisplayVersion} (required)" section_main SectionIn RO SetOutPath $INSTDIR - File /r "..\hakchi_gui\bin\Debug\net461\*" + File /r "..\hakchi_gui\bin\Debug\net48\*" AccessControl::GrantOnFile "$INSTDIR\" "(BU)" "GenericRead + GenericWrite" SectionEnd diff --git a/NSI/nsi-helper/App.config b/NSI/nsi-helper/App.config index 8324aa6ff..5ab1a3560 100644 --- a/NSI/nsi-helper/App.config +++ b/NSI/nsi-helper/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/NSI/nsi-helper/nsi-helper.csproj b/NSI/nsi-helper/nsi-helper.csproj index b9a93c388..7278f2bb7 100644 --- a/NSI/nsi-helper/nsi-helper.csproj +++ b/NSI/nsi-helper/nsi-helper.csproj @@ -8,9 +8,10 @@ Exe nsi_helper nsi-helper - v4.6 + v4.8.1 512 true + AnyCPU diff --git a/Scrapers/Scrapers.csproj b/Scrapers/Scrapers.csproj index e857208f8..670408cfa 100644 --- a/Scrapers/Scrapers.csproj +++ b/Scrapers/Scrapers.csproj @@ -6,7 +6,7 @@ - + diff --git a/ZIP Files/ZIP Files.vcxproj b/ZIP Files/ZIP Files.vcxproj index 698c7b007..7f4318779 100644 --- a/ZIP Files/ZIP Files.vcxproj +++ b/ZIP Files/ZIP Files.vcxproj @@ -68,19 +68,19 @@ msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug" -rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461" +rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48" msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui -"$(SolutionDir)Zipper\bin\Release\Zipper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-debug.zip" +"$(SolutionDir)Zipper\bin\Release\Zipper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-debug.zip" msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug" -rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461" +rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48" msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui -"$(SolutionDir)Zipper\bin\Release\Zipper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-debug.zip" +"$(SolutionDir)Zipper\bin\Release\Zipper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-debug.zip" diff --git a/Zipper/App.config b/Zipper/App.config index 8324aa6ff..4bfa00561 100644 --- a/Zipper/App.config +++ b/Zipper/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Zipper/Zipper.csproj b/Zipper/Zipper.csproj index cc970e6c9..d53a77239 100644 --- a/Zipper/Zipper.csproj +++ b/Zipper/Zipper.csproj @@ -8,9 +8,10 @@ Exe Zipper Zipper - v4.6 + v4.8 512 true + AnyCPU diff --git a/ce-data/ce-data.csproj b/ce-data/ce-data.csproj index ef0389a85..95772b13e 100644 --- a/ce-data/ce-data.csproj +++ b/ce-data/ce-data.csproj @@ -1,7 +1,7 @@  - net461 + net48 ce_data diff --git a/driver/source b/driver/source new file mode 160000 index 000000000..f6ee18622 --- /dev/null +++ b/driver/source @@ -0,0 +1 @@ +Subproject commit f6ee18622ecf434818136af67f4d71451c010c63 diff --git a/hakchi_gui/hakchi_gui.csproj b/hakchi_gui/hakchi_gui.csproj index 2a3f66564..c13e62d64 100644 --- a/hakchi_gui/hakchi_gui.csproj +++ b/hakchi_gui/hakchi_gui.csproj @@ -2,7 +2,7 @@ WinExe - net461 + net48 hakchi com.clusterrr.hakchi_gui true @@ -85,17 +85,17 @@ Gert Driesen for SSH.NET. - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + +