Merge pull request #141 from goatcorp/net8

Upgrade XIVLauncher.Core to net8
goatcorp · Jun 28, 2024 · 833fb9b · 833fb9b
2 parents 705e574 + 06198fe
commit 833fb9b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Dotnet Restore
         run: dotnet restore
@@ -41,7 +41,7 @@ jobs:
         run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=WINE_XIV_FEDORA_LINUX --no-restore -o ./dist/XIVLauncher.Core-fedora
 
       - name: Dotnet Build (Windows)
-        run: dotnet publish -r win10-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64
+        run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64
 
       - name: Dotnet Test
         run: dotnet test --no-build --verbosity normal
diff --git a/.github/workflows/generate_flatpak_nuget_deps.yml b/.github/workflows/generate_flatpak_nuget_deps.yml
@@ -23,14 +23,14 @@ jobs:
           sudo apt update -y
           sudo apt install flatpak -y
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo 
-          flatpak install --user org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y # Update this when needed.
-          flatpak install --user org.freedesktop.Sdk/x86_64/22.08 -y # As well as this, if dependency generation is failing.
+          flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 -y # Update this when needed.
+          flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y # As well as this, if dependency generation is failing.
 
       - name: Generate nuget-dependencies.json
         working-directory: ./src/XIVLauncher.Core/
         run: |
           curl -LO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/dotnet/flatpak-dotnet-generator.py
-          python3 flatpak-dotnet-generator.py nuget-dependencies.json XIVLauncher.Core.csproj
+          python3 flatpak-dotnet-generator.py --dotnet 8 --freedesktop 23.08 --runtime linux-x64 nuget-dependencies.json XIVLauncher.Core.csproj
 
       - name: Upload nuget-dependencies.json
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -29,13 +29,13 @@ jobs:
           sudo apt update -y
           sudo apt install flatpak -y
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo 
-          flatpak install --user org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y
-          flatpak install --user org.freedesktop.Sdk/x86_64/22.08 -y
+          flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 -y
+          flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x # Set this to be the same as the projects required dotnet version.
+          dotnet-version: 8.0.x # Set this to be the same as the projects required dotnet version.
 
       - name: Dotnet Restore
         working-directory: ./src/XIVLauncher.Core/
@@ -55,13 +55,13 @@ jobs:
 
       - name: Dotnet Build (Windows)
         working-directory: ./src/XIVLauncher.Core/
-        run: dotnet publish -r win10-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64
+        run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64
 
       - name: Generate nuget-dependencies.json
         working-directory: ./src/XIVLauncher.Core/
         run: |
           curl -LO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/dotnet/flatpak-dotnet-generator.py
-          python3 flatpak-dotnet-generator.py nuget-dependencies.json XIVLauncher.Core.csproj
+          python3 flatpak-dotnet-generator.py --dotnet 8 --freedesktop 23.08 --runtime linux-x64 nuget-dependencies.json XIVLauncher.Core.csproj
 
       - name: Upload nuget-dependencies.json
         uses: actions/upload-artifact@v3

diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher
diff --git a/src/XIVLauncher.Core/XIVLauncher.Core.csproj b/src/XIVLauncher.Core/XIVLauncher.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -13,9 +13,9 @@
     <FileVersion>$(Version)</FileVersion>
     <AssemblyVersion>$(Version)</AssemblyVersion>
 
-    <RuntimeIdentifiers>win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <PublishSingleFile>true</PublishSingleFile>
-    <!-- <SelfContained>true</SelfContained> -->
+    <SelfContained>true</SelfContained>
 
     <IsWindows
       Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
+1 −1		src/XIVLauncher.Common.Tests/XIVLauncher.Common.Tests.csproj
+1 −1		src/XIVLauncher.Common.Unix/XIVLauncher.Common.Unix.csproj
+1 −1		src/XIVLauncher.Common.Windows/XIVLauncher.Common.Windows.csproj
+1 −1		src/XIVLauncher.Common/XIVLauncher.Common.csproj