force use of net8 for nuget deps

goatcorp · Jun 28, 2024 · 06198fe · 06198fe
1 parent c10c11d
commit 06198fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
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.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
@@ -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