Skip to content

Commit 52f784e

Browse files
DanTheMan827DanTheMan827
authored
Update .NET Framework and NuGet Packages (#480)
Updates the .NET framework to 4.8 to get rid of the requirement to install 4.6.1 in during workflow execution, and also updates the NuGet packages being referenced. By removing the need for .NET 4.6.1, the time for the workflow to execute has been reduced considerably.
1 parent b7e01df commit 52f784e

File tree

18 files changed

+45
-52
lines changed

18 files changed

+45
-52
lines changed

‎.github/workflows/dotnet-desktop.yml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@ jobs:
3535
with:
3636
nsis-version: '3.10'
3737

38-
- name: Install .NET Framework 4.6.1
39-
shell: powershell
40-
run: |
41-
# Download the .NET Framework 4.6.1 installer
42-
$url = "https://go.microsoft.com/fwlink/?linkid=2099470"
43-
$outputPath = "$env:TEMP\dotnet461-installer.exe"
44-
Invoke-WebRequest -Uri "$url" -OutFile "$outputPath"
45-
46-
# Install silently
47-
Start-Process -FilePath $outputPath -ArgumentList "/quiet", "/norestart" -Wait
48-
49-
# Clean up the installer
50-
Remove-Item -Path $outputPath
51-
5238
- name: Set up .NET Core SDK 3.0
5339
uses: actions/setup-dotnet@v4
5440
with:
@@ -70,25 +56,26 @@ jobs:
7056
Set-Content -Path "${{ github.workspace }}\hakchi_gui\ApiKeys\TheGamesDB.txt" -Value $env:GamesDBApiKey -NoNewLine
7157
env:
7258
GamesDBApiKey: ${{ secrets.GAMESDB_API_KEY }}
73-
59+
7460
- name: Build solution
7561
run: |
7662
msbuild "Installer/Installer.vcxproj" /p:SolutionDir="${{ github.workspace }}\" /p:SolutionPath="${{ github.workspace }}\${{ env.solution }}" "/p:Platform=${{ env.buildPlatform }}"
7763
7864
- name: Run Hakchi Version Script
7965
run: |
80-
$exePath = "${{ github.workspace }}\hakchi_gui\bin\Debug\net461\hakchi.exe"
66+
$exePath = "${{ github.workspace }}\hakchi_gui\bin\Debug\net48\hakchi.exe"
8167
$versionPath = "${{ github.workspace }}\displayVersion.txt"
82-
& $exePath --versionFormat "{0}" --versionFile "$versionPath"
68+
Start-Process -FilePath $exePath -ArgumentList @("--versionFormat", "{0}", "--versionFile", $versionPath) -Wait
8369
$version = Get-Content -Path $versionPath | Out-String
8470
Remove-Item -Path $versionPath
8571
Add-Content -Path $ENV:GITHUB_ENV -Value "displayVersion=$version"
72+
Write-Output $version
8673
8774
- name: Upload Artifacts (Portable)
8875
uses: actions/upload-artifact@v4
8976
with:
9077
name: hakchi2-ce-${{ env.displayVersion }}-portable
91-
path: ${{ github.workspace }}\hakchi_gui\bin\Debug\net461\
78+
path: ${{ github.workspace }}\hakchi_gui\bin\Debug\net48\
9279

9380
- name: Upload Artifacts (Installer)
9481
uses: actions/upload-artifact@v4

‎.gitmodules‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[submodule "driver/source"]
2+
path = driver/source
3+
url = https://github.com/TeamShinkansen/libwdi.git
14
[submodule "Libraries/SSH.NET"]
25
path = Libraries/SSH.NET
36
url = https://github.com/TeamShinkansen/SSH.NET.git
@@ -7,7 +10,7 @@
710
url = https://github.com/TeamShinkansen/ProgressODoom.git
811
[submodule "Libraries/tiny7z"]
912
path = Libraries/tiny7z
10-
url = https://github.com/daPhie79/tiny7z.git
13+
url = https://github.com/TeamShinkansen/tiny7z.git
1114
[submodule "Libraries/LibUsbDotNet"]
1215
path = Libraries/LibUsbDotNet
1316
url = https://github.com/TeamShinkansen/LibUsbDotNet.git

‎Installer/Installer.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@
6767
<NMakeBuildCommandLine>msbuild.exe "$(SolutionDir)NSI\nsi-helper\nsi-helper.csproj" /p:Configuration=Release
6868
msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release
6969

70-
del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"
71-
rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"
70+
del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48"
71+
rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48"
7272

7373
msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui
7474

75-
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh"
75+
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)NSI\debug-uninstall.nsh"
7676

7777
makensis.exe "$(SolutionDir)NSI\Installer.nsi"
7878

7979
del "$(SolutionDir)NSI\debug-uninstall.nsh"</NMakeBuildCommandLine>
8080
<NMakeReBuildCommandLine>msbuild.exe "$(SolutionDir)NSI\nsi-helper\nsi-helper.csproj" /p:Configuration=Release
8181
msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release
8282

83-
del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"
84-
rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"
83+
del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48"
84+
rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net48"
8585

8686
msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui
8787

88-
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh"
88+
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)NSI\debug-uninstall.nsh"
8989

9090
makensis.exe "$(SolutionDir)NSI\Installer.nsi"
9191

‎Libraries/CueSharp‎

‎Libraries/ProgressODoom‎

‎Libraries/SSH.NET‎

‎Libraries/SpineGen‎

‎Libraries/tiny7z‎

Submodule tiny7z updated 33 files

‎NSI/Installer.nsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
!include "FileFunc.nsh"
44

55
; Display Version
6-
!system '..\hakchi_gui\bin\Debug\net461\hakchi.exe --versionFormat "!define DisplayVersion {0}" --versionFile version.nsh'
6+
!system '..\hakchi_gui\bin\Debug\net48\hakchi.exe --versionFormat "!define DisplayVersion {0}" --versionFile version.nsh'
77
!include ".\version.nsh"
88
!system 'del version.nsh'
99

1010
; Create zip files
11-
!system '..\Zipper\bin\Release\Zipper.exe ..\hakchi_gui\bin\Debug\net461 ..\hakchi_gui\bin\hakchi2-ce-${DisplayVersion}-portable.zip'
11+
!system '..\Zipper\bin\Release\Zipper.exe ..\hakchi_gui\bin\Debug\net48 ..\hakchi_gui\bin\hakchi2-ce-${DisplayVersion}-portable.zip'
1212

1313
; The icon of the installer
1414
Icon "..\hakchi_gui\icon_app.ico"
@@ -73,7 +73,7 @@ SectionEnd
7373
Section "Hakchi2 CE ${DisplayVersion} (required)" section_main
7474
SectionIn RO
7575
SetOutPath $INSTDIR
76-
File /r "..\hakchi_gui\bin\Debug\net461\*"
76+
File /r "..\hakchi_gui\bin\Debug\net48\*"
7777
AccessControl::GrantOnFile "$INSTDIR\" "(BU)" "GenericRead + GenericWrite"
7878
SectionEnd
7979

‎NSI/nsi-helper/App.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
55
</startup>
6-
</configuration>
6+
</configuration>

0 commit comments

Comments
 (0)