diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ba0ba42..3b3dee58 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 05e09009..10602c5a 100644 --- 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 index 21a73f3c..cdde1fbe 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit 21a73f3cecf8d5d9c920f8d2bbddf34a6b4bddca +Subproject commit cdde1fbeb31549dea13bd015e76b0b3964543c12 diff --git a/src/XIVLauncher.Core/XIVLauncher.Core.csproj b/src/XIVLauncher.Core/XIVLauncher.Core.csproj index 379bce8d..657ff68b 100644 --- a/src/XIVLauncher.Core/XIVLauncher.Core.csproj +++ b/src/XIVLauncher.Core/XIVLauncher.Core.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable true @@ -13,9 +13,9 @@ $(Version) $(Version) - win10-x64;linux-x64;osx-x64 + win-x64;linux-x64;osx-x64 true - + true