net8

goatcorp · Jun 28, 2024 · 6038a2a · 6038a2a
1 parent 705e574
commit 6038a2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 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/make-release.yml b/.github/workflows/make-release.yml
@@ -35,7 +35,7 @@ jobs:
       - 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,7 +55,7 @@ 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/

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