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.
TeamShinkansen · Nov 8, 2024 · 52f784e · 52f784e
1 parent b7e01df
commit 52f784e
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 52 deletions.
diff --git 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,26 @@ 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"
+          $exePath = "${{ github.workspace }}\hakchi_gui\bin\Debug\net48\hakchi.exe"
           $versionPath = "${{ github.workspace }}\displayVersion.txt"
-          & $exePath --versionFormat "{0}" --versionFile "$versionPath"
+          Start-Process -FilePath $exePath -ArgumentList @("--versionFormat", "{0}", "--versionFile", $versionPath) -Wait
           $version = Get-Content -Path $versionPath | Out-String
           Remove-Item -Path $versionPath
           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
@@ -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
@@ -67,25 +67,25 @@
     <NMakeBuildCommandLine>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"
 
 del "$(SolutionDir)NSI\debug-uninstall.nsh"</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>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
diff --git a/Libraries/ProgressODoom b/Libraries/ProgressODoom
diff --git a/Libraries/SSH.NET b/Libraries/SSH.NET
diff --git a/Libraries/SpineGen b/Libraries/SpineGen
diff --git a/Libraries/tiny7z b/Libraries/tiny7z
diff --git 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
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/NSI/nsi-helper/nsi-helper.csproj b/NSI/nsi-helper/nsi-helper.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>nsi_helper</RootNamespace>
     <AssemblyName>nsi-helper</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/Scrapers/Scrapers.csproj b/Scrapers/Scrapers.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/ZIP Files/ZIP Files.vcxproj b/ZIP Files/ZIP Files.vcxproj
@@ -68,19 +68,19 @@
     <NMakeBuildCommandLine>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"</NMakeBuildCommandLine>
+"$(SolutionDir)Zipper\bin\Release\Zipper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-debug.zip"</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>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"</NMakeReBuildCommandLine>
+"$(SolutionDir)Zipper\bin\Release\Zipper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net48" "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-debug.zip"</NMakeReBuildCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>

diff --git a/Zipper/App.config b/Zipper/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/Zipper/Zipper.csproj b/Zipper/Zipper.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Zipper</RootNamespace>
     <AssemblyName>Zipper</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/ce-data/ce-data.csproj b/ce-data/ce-data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>ce_data</RootNamespace>
   </PropertyGroup>
 

diff --git a/driver/source b/driver/source
diff --git a/hakchi_gui/hakchi_gui.csproj b/hakchi_gui/hakchi_gui.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AssemblyName>hakchi</AssemblyName>
     <RootNamespace>com.clusterrr.hakchi_gui</RootNamespace>
 	  <UseWindowsForms>true</UseWindowsForms>
@@ -85,17 +85,17 @@ Gert Driesen for SSH.NET.</Description>
 
   <ItemGroup>
     <PackageReference Include="ArxOne.Ftp" Version="1.41.4" />
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.4.11" />
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
     <PackageReference Include="CommonMark.NET" Version="0.15.1" />
     <PackageReference Include="Costura.Fody" Version="5.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LibUsbDotNet" Version="2.2.29" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="nQuant" Version="1.0.3" />
-    <PackageReference Include="SharpCompress" Version="0.32.2" />
-    <PackageReference Include="Tmds.MDns" Version="0.7.1" />
+    <PackageReference Include="SharpCompress" Version="0.38.0" />
+    <PackageReference Include="Tmds.MDns" Version="0.8.0" />
   </ItemGroup>
 
   <ItemGroup>
+3 −3		SpineGen.Drawing.System.Drawing/SpineGen.Drawing.System.Drawing.csproj
+2 −2		SpineGen.JSON/SpineGen.JSON.csproj
+2 −2		SpineGen/SpineGen.csproj
+1 −1		.gitignore
+9 −4		README.md
+7 −7		tiny7z.sln
+0 −89		tiny7z.test/Program.cs
+0 −10		tiny7z.test/Util.cs
+3 −3		tiny7z/App.config
+144 −14		tiny7z/Archive/Interfaces.cs
+56 −32		tiny7z/Archive/SevenZip/SevenZipArchive.cs
+83 −51		tiny7z/Archive/SevenZip/SevenZipCompressor.cs
+19 −5		tiny7z/Archive/SevenZip/SevenZipException.cs
+177 −89		tiny7z/Archive/SevenZip/SevenZipExtractor.cs
+53 −42		tiny7z/Archive/SevenZip/SevenZipHeader.cs
+4 −3		tiny7z/Archive/SevenZip/SevenZipMethods.cs
+116 −0		tiny7z/Archive/SevenZip/SevenZipProgressProvider.cs
+26 −12		tiny7z/Archive/SevenZip/SevenZipStreamsCompressor.cs
+75 −28		tiny7z/Archive/SevenZip/SevenZipStreamsExtractor.cs
+56 −30		tiny7z/Common/CRC.cs
+11 −11		tiny7z/Common/Streams/AbstractMultiStream.cs
+19 −32		tiny7z/Common/Streams/CRCStream.cs
+14 −8		tiny7z/Common/Streams/MultiFileStream.cs
+3 −3		tiny7z/Common/Streams/MultiStream.cs
+13 −18		tiny7z/Common/Streams/NullStream.cs
+14 −13		tiny7z/Common/Streams/SubStream.cs
+8 −11		tiny7z/Common/Util.cs
+3 −3		tiny7z/Properties/AssemblyInfo.cs
+26 −0		tiny7z/ToDo.txt
+3 −1		tiny7z/tiny7z.csproj
+0 −0		tiny7zTool/App.config
+4 −0		tiny7zTool/FodyWeavers.xml
+111 −0		tiny7zTool/FodyWeavers.xsd
+389 −0		tiny7zTool/Program.cs
+8 −8		tiny7zTool/Properties/AssemblyInfo.cs
+26 −9		tiny7zTool/tiny7zTool.csproj