From 6038a2a19be12ea430dabb8cf80b186092c93dfb Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:22:24 +0100 Subject: [PATCH 1/5] net8 --- .github/workflows/build.yml | 4 ++-- .github/workflows/make-release.yml | 4 ++-- lib/FFXIVQuickLauncher | 2 +- src/XIVLauncher.Core/XIVLauncher.Core.csproj | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) 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 From f885752b7b5684d094641f7189b028e3c8f9ffb3 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:29:44 +0100 Subject: [PATCH 2/5] update ci for net8 --- .github/workflows/generate_flatpak_nuget_deps.yml | 4 ++-- .github/workflows/make-release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate_flatpak_nuget_deps.yml b/.github/workflows/generate_flatpak_nuget_deps.yml index 57f68240..fe4b6a27 100644 --- a/.github/workflows/generate_flatpak_nuget_deps.yml +++ b/.github/workflows/generate_flatpak_nuget_deps.yml @@ -23,8 +23,8 @@ 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/ diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 10602c5a..60dbc43f 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -29,8 +29,8 @@ 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 From 464d36a626022b2b53d5f5ff4085b180447dea8a Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:33:31 +0100 Subject: [PATCH 3/5] re-add net6 for python script --- .github/workflows/generate_flatpak_nuget_deps.yml | 2 +- .github/workflows/make-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_flatpak_nuget_deps.yml b/.github/workflows/generate_flatpak_nuget_deps.yml index fe4b6a27..2c7963ae 100644 --- a/.github/workflows/generate_flatpak_nuget_deps.yml +++ b/.github/workflows/generate_flatpak_nuget_deps.yml @@ -23,7 +23,7 @@ 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.dotnet8/x86_64/23.08 -y # Update this when needed. + flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.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 diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 60dbc43f..2e2bedbd 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -29,7 +29,7 @@ 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.dotnet8/x86_64/23.08 -y + flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y - name: Setup .NET From c10c11d7e382976e5c1779e03976dc38b429f8e0 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:36:18 +0100 Subject: [PATCH 4/5] readd freedesktop 22.08 --- .github/workflows/generate_flatpak_nuget_deps.yml | 2 +- .github/workflows/make-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_flatpak_nuget_deps.yml b/.github/workflows/generate_flatpak_nuget_deps.yml index 2c7963ae..cc416282 100644 --- a/.github/workflows/generate_flatpak_nuget_deps.yml +++ b/.github/workflows/generate_flatpak_nuget_deps.yml @@ -24,7 +24,7 @@ jobs: 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.dotnet8/x86_64/23.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.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. + flatpak install --user org.freedesktop.Sdk/x86_64/23.08 org.freedesktop.Sdk/x86_64/22.08 -y # As well as this, if dependency generation is failing. - name: Generate nuget-dependencies.json working-directory: ./src/XIVLauncher.Core/ diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 2e2bedbd..f7a635ae 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -30,7 +30,7 @@ jobs: 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.dotnet8/x86_64/23.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y - flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y + flatpak install --user org.freedesktop.Sdk/x86_64/23.08 org.freedesktop.Sdk/x86_64/22.08 -y - name: Setup .NET uses: actions/setup-dotnet@v3 From 06198feedabaad6f80db3f92479d11e3dc95168b Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:43:54 +0100 Subject: [PATCH 5/5] force use of net8 for nuget deps --- .github/workflows/generate_flatpak_nuget_deps.yml | 6 +++--- .github/workflows/make-release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/generate_flatpak_nuget_deps.yml b/.github/workflows/generate_flatpak_nuget_deps.yml index cc416282..aa843e35 100644 --- 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.dotnet8/x86_64/23.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y # Update this when needed. - flatpak install --user org.freedesktop.Sdk/x86_64/23.08 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 index f7a635ae..bdcbaefb 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -29,8 +29,8 @@ 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.dotnet8/x86_64/23.08 org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 -y - flatpak install --user org.freedesktop.Sdk/x86_64/23.08 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 @@ -61,7 +61,7 @@ jobs: 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