From aff349235f1bb01c2e55a688799d1437ad966bcb Mon Sep 17 00:00:00 2001 From: Rankyn Bass Date: Mon, 17 Jun 2024 15:55:33 -0700 Subject: [PATCH 01/12] Add compat tool environment vars and handling. --- src/XIVLauncher.Core/Components/MainPage/MainPage.cs | 11 +++++++++++ .../Components/SettingsPage/Tabs/SettingsTabGame.cs | 5 ++++- src/XIVLauncher.Core/CoreEnvironmentSettings.cs | 1 + src/XIVLauncher.Core/Program.cs | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs index 20e8ac3b..89173b8d 100644 --- a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs +++ b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs @@ -676,6 +676,17 @@ public async Task StartGameAndAddon(Launcher.LoginResult loginResult, b IGameRunner runner; + // Set LD_PRELOAD to value of XL_PRELOAD if we're running as a steam compatibility tool. + // This check must be done before the FixLDP check so that it will still work. + if (CoreEnvironmentSettings.IsSteamCompatTool) + { + var ldpreload = System.Environment.GetEnvironmentVariable("LD_PRELOAD") ?? ""; + var xlpreload = System.Environment.GetEnvironmentVariable("XL_PRELOAD") ?? ""; + ldpreload = (ldpreload + ":" + xlpreload).Trim(':'); + if (!string.IsNullOrEmpty(ldpreload)) + System.Environment.SetEnvironmentVariable("LD_PRELOAD", ldpreload); + } + // Hack: Force C.utf8 to fix incorrect unicode paths if (App.Settings.FixLocale == true && !string.IsNullOrEmpty(Program.CType)) { diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs index 0ed46625..2418c2d9 100644 --- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs +++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs @@ -33,7 +33,10 @@ public class SettingsTabGame : SettingsTab new SettingsEntry("Game DPI Awareness", "Select the game's DPI Awareness. Change this if the game's scaling looks wrong.", () => Program.Config.DpiAwareness ?? DpiAwareness.Unaware, x => Program.Config.DpiAwareness = x), new SettingsEntry("Free Trial Account", "Check this if you are using a free trial account.", () => Program.Config.IsFt ?? false, x => Program.Config.IsFt = x), new SettingsEntry("Use XIVLauncher authenticator/OTP macros", "Check this if you want to use the XIVLauncher authenticator app or macros.", () => Program.Config.IsOtpServer ?? false, x => Program.Config.IsOtpServer = x), - new SettingsEntry("Ignore Steam", "Check this if you do not want XIVLauncher to communicate with Steam (Requires Restart).", () => Program.Config.IsIgnoringSteam ?? false, x => Program.Config.IsIgnoringSteam = x), + new SettingsEntry("Ignore Steam", "Check this if you do not want XIVLauncher to communicate with Steam (Requires Restart).", () => Program.Config.IsIgnoringSteam ?? false, x => Program.Config.IsIgnoringSteam = x) + { + CheckVisibility = () => !CoreEnvironmentSettings.IsSteamCompatTool, + }, new SettingsEntry("Use Experimental UID Cache", "Tries to save your login token for the next start. Can result in launching with expired sessions.\nDisable if receiving FFXIV error 1012 or 500X.", () => Program.Config.IsUidCacheEnabled ?? false, x => Program.Config.IsUidCacheEnabled = x), }; diff --git a/src/XIVLauncher.Core/CoreEnvironmentSettings.cs b/src/XIVLauncher.Core/CoreEnvironmentSettings.cs index 69b0e706..0d067b25 100644 --- a/src/XIVLauncher.Core/CoreEnvironmentSettings.cs +++ b/src/XIVLauncher.Core/CoreEnvironmentSettings.cs @@ -15,6 +15,7 @@ public static class CoreEnvironmentSettings public static bool ClearLogs => CheckEnvBool("XL_CLEAR_LOGS"); public static bool ClearAll => CheckEnvBool("XL_CLEAR_ALL"); public static bool? UseSteam => CheckEnvBoolOrNull("XL_USE_STEAM"); // Fix for Steam Deck users who lock themselves out + public static bool IsSteamCompatTool => CheckEnvBool("XL_SCT"); private static bool CheckEnvBool(string key) { diff --git a/src/XIVLauncher.Core/Program.cs b/src/XIVLauncher.Core/Program.cs index 08131a8e..b37dabaa 100644 --- a/src/XIVLauncher.Core/Program.cs +++ b/src/XIVLauncher.Core/Program.cs @@ -225,7 +225,7 @@ private static void Main(string[] args) default: throw new PlatformNotSupportedException(); } - if (!Config.IsIgnoringSteam ?? true) + if (Config.IsIgnoringSteam != true || CoreEnvironmentSettings.IsSteamCompatTool) { try { From 09d2f1d4d8dd063cce9f9bcaee723d0f56d478a8 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:32:05 +0100 Subject: [PATCH 02/12] submodule update - 7.0 download --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index 625d624b..f7e3cea4 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit 625d624ba48e499cc640c477ae7ec7b28981450d +Subproject commit f7e3cea4f509ec6a8258c3c312ba11b4134549db From cea5204d2fa7ab0cdc9f2c509964db9851ceb454 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:45:21 +0100 Subject: [PATCH 03/12] submodule update --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index f7e3cea4..cde98aa2 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit f7e3cea4f509ec6a8258c3c312ba11b4134549db +Subproject commit cde98aa2b213d49b71fb9739182f77fb3adf09fb From fd558125f2fd13d3ffe7cc0aa80b73812a473513 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:25:04 +0100 Subject: [PATCH 04/12] submodule update - SSL changes --- lib/FFXIVQuickLauncher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index cde98aa2..60cb2c2f 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit cde98aa2b213d49b71fb9739182f77fb3adf09fb +Subproject commit 60cb2c2f1d6a8d9aae18f2a226193ee284fe38fe From 3545da185a712a456da05151e5f16305b0fac28e Mon Sep 17 00:00:00 2001 From: Rankyn Bass Date: Thu, 27 Jun 2024 20:59:27 -0700 Subject: [PATCH 05/12] Had to update MainPage.cs with some TimeSpans --- lib/FFXIVQuickLauncher | 2 +- src/XIVLauncher.Core/Components/MainPage/MainPage.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher index 60cb2c2f..21a73f3c 160000 --- a/lib/FFXIVQuickLauncher +++ b/lib/FFXIVQuickLauncher @@ -1 +1 @@ -Subproject commit 60cb2c2f1d6a8d9aae18f2a226193ee284fe38fe +Subproject commit 21a73f3cecf8d5d9c920f8d2bbddf34a6b4bddca diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs index 89173b8d..fa7280ad 100644 --- a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs +++ b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs @@ -1049,7 +1049,7 @@ void UpdatePatchStatus() finally { token.Cancel(); - statusThread.Join(3000); + statusThread.Join(TimeSpan.FromMilliseconds(1000)); } return true; @@ -1149,7 +1149,7 @@ private async Task RepairGame(Launcher.LoginResult loginResult) Log.Information("STARTING REPAIR"); // TODO: bundle the PatchInstaller with xl-core on Windows and run this remotely - using var verify = new PatchVerifier(Program.CommonSettings, loginResult, 20, loginResult.OauthLogin.MaxExpansion, false); + using var verify = new PatchVerifier(Program.CommonSettings, loginResult, TimeSpan.FromMilliseconds(100), loginResult.OauthLogin.MaxExpansion, false); for (bool doVerify = true; doVerify;) { 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 From b18da80617213dbcd4375e7234f9ace84a6279b7 Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:50:10 +0100 Subject: [PATCH 11/12] chore: bump version to 1.1.0.0 --- src/XIVLauncher.Core/XIVLauncher.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XIVLauncher.Core/XIVLauncher.Core.csproj b/src/XIVLauncher.Core/XIVLauncher.Core.csproj index 379bce8d..a4afde6a 100644 --- a/src/XIVLauncher.Core/XIVLauncher.Core.csproj +++ b/src/XIVLauncher.Core/XIVLauncher.Core.csproj @@ -9,7 +9,7 @@ latest Resources\dalamud_icon.ico - 1.0.9.0 + 1.1.0.0 $(Version) $(Version) From 4048b451f01cf9412c40e630ac6d045d967b30cb Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:14:46 +0100 Subject: [PATCH 12/12] ci: dont specify linux runtime as it breaks flatpak --- .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 aa843e35..a2547519 100644 --- a/.github/workflows/generate_flatpak_nuget_deps.yml +++ b/.github/workflows/generate_flatpak_nuget_deps.yml @@ -30,7 +30,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 --dotnet 8 --freedesktop 23.08 --runtime linux-x64 nuget-dependencies.json XIVLauncher.Core.csproj + python3 flatpak-dotnet-generator.py --dotnet 8 --freedesktop 23.08 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 bdcbaefb..860e4377 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -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 --dotnet 8 --freedesktop 23.08 --runtime linux-x64 nuget-dependencies.json XIVLauncher.Core.csproj + python3 flatpak-dotnet-generator.py --dotnet 8 --freedesktop 23.08 nuget-dependencies.json XIVLauncher.Core.csproj - name: Upload nuget-dependencies.json uses: actions/upload-artifact@v3