revert 578b6bf00e

revert revert 9905ee17c2

Re-add missing solution configurations for Ryujinx.Audio.Backends.Apple (#10)

The original revert was made for testing purposes, so it is being rereverted.

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/10

.forgejo/labeler.yml

@@ -10,6 +10,10 @@ gpu:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx.Graphics.*/**', 'src/Spv.Generator/**', 'src/Ryujinx.ShaderTools/**']
 
+input:
+- changed-files:
+  - any-glob-to-any-file: ['src/Ryujinx.Input*/**', 'src/Ryujinx/UI/Views/Input/**']
+
 'graphics-backend:opengl':
 - changed-files:
   - any-glob-to-any-file: 'src/Ryujinx.Graphics.OpenGL/**'
@@ -18,17 +22,17 @@ gpu:
 - changed-files:
   - any-glob-to-any-file: ['src/Ryujinx.Graphics.Vulkan/**', 'src/Spv.Generator/**']
 
-'graphics-backend:metal':
-  - changed-files:
-      - any-glob-to-any-file: ['src/Ryujinx.Graphics.Metal/**', 'src/Ryujinx.Graphics.Metal.SharpMetalExtensions/**']
-
 gui:
 - changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.Common/**', 'src/Ryujinx.UI.LocaleGenerator/**']
+  - any-glob-to-any-file: ['src/Ryujinx/**', 'src/Ryujinx.UI.LocaleGenerator/**']
 
-horizon:
+'horizon/hle':
 - changed-files:
-  - any-glob-to-any-file: ['src/Ryujinx.HLE/**', 'src/Ryujinx.Horizon/**']
+  - any-glob-to-any-file: ['src/Ryujinx.HLE/**', 'src/Ryujinx.HLE.Generators/**', 'src/Ryujinx.Horizon/**']
+
+i18n:
+- changed-files:
+  - any-glob-to-any-file: ['assets/**/*.json', 'src/Ryujinx.UI.LocaleGenerator/**']
 
 kernel:
 - changed-files:
@@ -44,4 +48,4 @@ documentation:
 
 ldn:
 - changed-files:
-  - any-glob-to-any-file: 'src/Ryujinx.HLE/HOS/Services/Ldn/**'
+  - any-glob-to-any-file: ['src/Ryujinx.HLE/HOS/Services/Ldn/**', 'src/Ryujinx/UI/Windows/LdnGamesListWindow.*', 'src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs']

.forgejo/workflows/build.yml

@@ -46,13 +46,17 @@ jobs:
         with:
           token: ${{ secrets.SETUP_GLI_TOKEN }}
 
+      - name: Install 7zip
+        run: |
+          sudo apt update && sudo apt install -y 7zip
+
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.forgejo/csc.json"
 
       - name: Get version info
         id: version_info
         run: |
-          echo "result=$(gli get-next-version -c Stable -R)" >> $FORGEJO_OUTPUT
+          echo "result=$(gli get-next-version -c Canary -R)" >> $FORGEJO_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ forgejo.sha }}")" >> $FORGEJO_OUTPUT
         shell: bash
 
@@ -83,14 +87,24 @@ jobs:
         run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.result }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
         if: forgejo.event_name == 'pull_request'
 
-      - name: Set executable bit
+      - name: Packing Windows builds
+        if: contains(matrix.platform.name, 'win')
         run: |
-          chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
-        if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'linux')
+          7z a artifact/ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-${{ matrix.platform.zip_os_name }}.7z publish
+        shell: bash
+
+      - name: Upload Ryujinx Windows artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-${{ matrix.platform.zip_os_name }}
+          path: artifact
+        if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'win')
 
       - name: Build AppImage
         if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'linux')
         run: |
+          chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
+
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
           sudo apt update && sudo apt install -y zsync desktop-file-utils appstream libfuse2t64
@@ -118,14 +132,7 @@ jobs:
           BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
         shell: bash
 
-      - name: Upload Ryujinx artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ryujinx-${{ matrix.configuration }}-${{ steps.version_info.outputs.result }}+${{ steps.version_info.outputs.git_short_hash }}-${{ matrix.platform.zip_os_name }}
-          path: publish
-        if: forgejo.event_name == 'pull_request'
-
-      - name: Upload Ryujinx (AppImage) artifact
+      - name: Upload Ryujinx AppImage artifact
         uses: actions/upload-artifact@v4
         if: forgejo.event_name == 'pull_request' && contains(matrix.platform.name, 'linux')
         with:

.forgejo/workflows/canary.yml

@@ -84,6 +84,7 @@ jobs:
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
+          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.7z ../publish
           popd
         shell: bash
 
@@ -94,6 +95,7 @@ jobs:
           rm libarmeilleure-jitsupport.dylib
           chmod +x Ryujinx.sh Ryujinx
           tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          tar -cJvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.xz ../publish
           popd
         shell: bash
 

.forgejo/workflows/pr_triage.yml

@@ -18,7 +18,7 @@ jobs:
            ref: master
 
       - name: Update labels based on changes
-        uses: actions/labeler@v5
+        uses: actions/labeler@v6
         with:
           repo-token: ${{ secrets.LABELER_TOKEN }}
           configuration-path: .forgejo/labeler.yml

.forgejo/workflows/release.yml

@@ -81,6 +81,7 @@ jobs:
           pushd publish
           rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
+          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.7z ../publish
           popd
         shell: bash
 
@@ -91,6 +92,7 @@ jobs:
           rm libarmeilleure-jitsupport.dylib
           chmod +x Ryujinx.sh Ryujinx
           tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          tar -cJvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.xz ../publish
           popd
         shell: bash
 

Directory.Packages.props

@@ -8,6 +8,7 @@
     <PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
     <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.12" />
+    <PackageVersion Include="SharpCompress" Version="0.47.4" />
     <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.4" />
     <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.4" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
@@ -16,7 +17,7 @@
     <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2" />
-    <PackageVersion Include="ppy.SDL3-CS" Version="2025.920.0" />
+    <PackageVersion Include="ppy.SDL3-CS" Version="2026.320.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Concentus" Version="2.2.2" />
@@ -43,12 +44,11 @@
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.129" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.44" />
-    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.44" />
+    <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="2.0.6" />
     <PackageVersion Include="Gommon" Version="2.8.0.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.11.1" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />

Ryujinx.sln

@@ -573,6 +573,16 @@ Global
 		{D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.Build.0 = Release|Any CPU
 		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x64.ActiveCfg = Debug|Any CPU
+        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x64.Build.0 = Debug|Any CPU
+        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x86.ActiveCfg = Debug|Any CPU
+        {AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Debug|x86.Build.0 = Debug|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x64.ActiveCfg = Release|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x64.Build.0 = Release|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x86.ActiveCfg = Release|Any CPU
+		{AC26EFF0-8593-4184-9A09-98E37EFFB32E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

assets/Locales/RenderDoc.json

@@ -22,7 +22,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "启动 RenderDoc 帧捕获",
-        "zh_TW": ""
+        "zh_TW": "啟動 RenderDoc 畫格擷取"
       }
     },
     {
@@ -47,7 +47,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "结束 RenderDoc 帧捕获",
-        "zh_TW": ""
+        "zh_TW": "停止 RenderDoc 畫格擷取"
       }
     },
     {
@@ -72,7 +72,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "丢弃 RenderDoc 帧捕获",
-        "zh_TW": ""
+        "zh_TW": "捨棄 RenderDoc 畫格擷取"
       }
     },
     {
@@ -97,7 +97,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "结束当前正在进行的 RenderDoc 帧捕获，并立即丢弃其结果。",
-        "zh_TW": ""
+        "zh_TW": "停止正在執行的 RenderDoc 畫格擷取，且立即捨棄其結果。"
       }
     }
   ]

assets/Locales/Root.json

@@ -582,8 +582,8 @@
         "de_DE": "",
         "el_GR": "",
         "en_US": "Restart Emulation",
-        "es_ES": "",
-        "fr_FR": "",
+        "es_ES": "Reiniciar Emulación",
+        "fr_FR": "Redémarrer l'Émulation",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
@@ -597,7 +597,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "重新啟動模擬"
       }
     },
     {
@@ -11332,8 +11332,8 @@
         "de_DE": "Speichern",
         "el_GR": "",
         "en_US": "Save",
-        "es_ES": "",
-        "fr_FR": "",
+        "es_ES": "Guardar",
+        "fr_FR": "Sauvegarder",
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
@@ -11347,7 +11347,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "儲存"
       }
     },
     {

src/Ryujinx.HLE/HOS/Services/Caps/CaptureManager.cs

@@ -118,8 +118,11 @@ namespace Ryujinx.HLE.HOS.Services.Caps
                 }
 
                 // NOTE: The saved JPEG file doesn't have the limitation in the extra EXIF data.
-                using SKBitmap bitmap = new(new SKImageInfo(1280, 720, SKColorType.Rgba8888));
-                Marshal.Copy(screenshotData, 0, bitmap.GetPixels(), screenshotData.Length);
+                using SKBitmap bitmap = new(new SKImageInfo(1280, 720, SKColorType.Rgba8888, SKAlphaType.Premul));
+                int dataLen = screenshotData.Length > bitmap.ByteCount ? bitmap.ByteCount : screenshotData.Length;
+
+                Marshal.Copy(screenshotData, 0, bitmap.GetPixels(), dataLen);
+
                 using SKData data = bitmap.Encode(SKEncodedImageFormat.Jpeg, 80);
                 using FileStream file = File.OpenWrite(filePath);
                 data.SaveTo(file);

src/Ryujinx.Input.SDL3/SDL3Gamepad.cs

@@ -151,7 +151,9 @@ namespace Ryujinx.Input.SDL3
                 result |= GamepadFeaturesFlag.Led;
             }
             SDL_UnlockProperties(propID);
-            SDL_DestroyProperties(propID);
+
+            // NOTE: Do not call SDL_DestroyProperties here. These properties are owned
+            // internally by SDL and are freed when SDL_CloseGamepad is called (in Dispose).
 
             return result;
         }

src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs

@@ -331,28 +331,18 @@ namespace Ryujinx.Input.SDL3
 
         public IEnumerable<IGamepad> GetGamepads()
         {
-            lock (_gamepadsIds)
+            string[] ids;
+            lock (_lock)
             {
-                foreach (var gamepad in _gamepadsIds)
-                {
-                    yield return GetGamepad(gamepad.Value);
-                }
+                ids = _gamepadsIds.Values
+                    .Concat(_joyConsIds.Values)
+                    .Concat(_linkedJoyConsIds.Values)
+                    .ToArray();
             }
 
-            lock (_joyConsIds)
+            foreach (string id in ids)
             {
-                foreach (var gamepad in _joyConsIds)
-                {
-                    yield return GetGamepad(gamepad.Value);
-                }
-            }
-            
-            lock (_linkedJoyConsIds)
-            {
-                foreach (var gamepad in _linkedJoyConsIds)
-                {
-                    yield return GetGamepad(gamepad.Value);
-                }
+                yield return GetGamepad(id);
             }
         }
     }

src/Ryujinx.Input/HLE/NpadController.cs

@@ -563,7 +563,7 @@ namespace Ryujinx.Input.HLE
                     float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15) * controllerConfig.Rumble.StrongRumble));
                     float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85) * controllerConfig.Rumble.WeakRumble));
 
-                    _gamepad.Rumble(low, high, uint.MaxValue);
+                    _gamepad?.Rumble(low, high, uint.MaxValue);
 
                     Logger.Debug?.Print(LogClass.Hid, $"Effect for {controllerConfig.PlayerIndex} " +
                         $"L.low.amp={leftVibrationValue.AmplitudeLow}, " +

src/Ryujinx.SDL3.Common/SDL3Driver.cs

@@ -61,6 +61,14 @@ namespace Ryujinx.SDL3.Common
                 SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1");
                 SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
 
+                // When hid_nintendo is loaded, it creates separate evdev devices for the gamepad
+                // and IMU which SDL3's evdev backend combines via UNIQ matching. Using HIDAPI
+                // instead conflicts with the kernel driver and breaks motion and hotplug.
+                if (OperatingSystem.IsLinux() && Directory.Exists("/sys/module/hid_nintendo"))
+                {
+                    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH, "0");
+                }
+
                 // NOTE: As of SDL3 2.24.0, joycons are combined by default but the motion source only come from one of them.
                 // We disable this behavior for now.
                 SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS, "0");

src/Ryujinx/Ryujinx.csproj

@@ -46,6 +46,7 @@
     <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Avalonia.Controls.DataGrid" />
     <PackageReference Include="Avalonia.Markup.Xaml.Loader" />
+    <PackageReference Include="SharpCompress" />
     <PackageReference Include="Svg.Controls.Avalonia" />
     <PackageReference Include="Svg.Controls.Skia.Avalonia" />
     <PackageReference Include="DynamicData" />
@@ -68,7 +69,6 @@
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
     <PackageReference Include="SPB" />
-    <PackageReference Include="SharpZipLib" />
   </ItemGroup>
   
   <ItemGroup>

src/Ryujinx/Systems/Updater/Updater.GitLab.cs

@@ -91,7 +91,7 @@ namespace Ryujinx.Ava.Systems
             }
 
             // If build URL not found, assume no new update is available.
-            if (_versionResponse.ArtifactUrl is null or "")
+            if (string.IsNullOrEmpty(_versionResponse.ArtifactUrl))
             {
                 if (showVersionUpToDate)
                 {
@@ -123,6 +123,8 @@ namespace Ryujinx.Ava.Systems
                 return default;
             }
 
+            _connectionCount = (int)_versionResponse.MaxConcurrency;
+
             return (currentVersion, newVersion);
         }
     }

src/Ryujinx/Systems/Updater/Updater.cs

@@ -1,19 +1,20 @@
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
 using Gommon;
-using ICSharpCode.SharpZipLib.GZip;
-using ICSharpCode.SharpZipLib.Tar;
-using ICSharpCode.SharpZipLib.Zip;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
+using SharpCompress.Archives;
+using SharpCompress.Compressors.Xz;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Formats.Tar;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -21,7 +22,6 @@ using System.Net.NetworkInformation;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -32,8 +32,8 @@ namespace Ryujinx.Ava.Systems
         private static readonly string _homeDir = AppDomain.CurrentDomain.BaseDirectory;
         private static readonly string _updateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
         private static readonly string _updatePublishDir = Path.Combine(_updateDir, "publish");
-        private const int ConnectionCount = 4;
         
+        private static int _connectionCount = 1;
         private static long _buildSize;
         private static bool _updateSuccessful;
         private static bool _running;
@@ -73,27 +73,6 @@ namespace Ryujinx.Ava.Systems
                 return;
             }
 
-            // Fetch build size information to learn chunk sizes.
-            using HttpClient buildSizeClient = ConstructHttpClient();
-            try
-            {
-                buildSizeClient.DefaultRequestHeaders.Add("Range", "bytes=0-0");
-                
-                // Forgejo instance is located in Ukraine. Connection times will vary across the world.
-                buildSizeClient.Timeout = TimeSpan.FromSeconds(10);
-
-                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead);
-
-                _buildSize = message.Content.Headers.ContentRange.Length.Value;
-            }
-            catch (Exception ex)
-            {
-                Logger.Warning?.Print(LogClass.Application, ex.Message);
-                Logger.Warning?.Print(LogClass.Application, "Couldn't determine build size for update, using single-threaded updater");
-
-                _buildSize = -1;
-            }
-
             await Dispatcher.UIThread.InvokeAsync(async () =>
             {
                 string newVersionString = ReleaseInformation.IsCanaryBuild
@@ -143,6 +122,14 @@ namespace Ryujinx.Ava.Systems
 
             Directory.CreateDirectory(_updateDir);
 
+            // If we get a .zip url switch it to the preferred .7z file instead
+            // The update server still returns the .zip url by default for legacy support
+            downloadUrl = downloadUrl.Replace(".zip", ".7z");
+            
+            // If we get a .tar.gz url switch it to the preferred .tar.xz file instead
+            // The update server still returns the .tar.gz url by default for legacy support
+            downloadUrl = downloadUrl.Replace(".tar.gz", ".tar.xz");
+            
             string updateFile = Path.Combine(_updateDir, "update.bin");
 
             TaskDialog taskDialog = new()
@@ -153,6 +140,27 @@ namespace Ryujinx.Ava.Systems
                 ShowProgressBar = true,
                 XamlRoot = RyujinxApp.MainWindow,
             };
+            
+            // Fetch build size information to learn chunk sizes.
+            using HttpClient buildSizeClient = ConstructHttpClient();
+            try
+            {
+                buildSizeClient.DefaultRequestHeaders.Add("Range", "bytes=0-0");
+                
+                // Forgejo instance is located in Ukraine. Connection times will vary across the world.
+                buildSizeClient.Timeout = TimeSpan.FromSeconds(10);
+
+                HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead);
+
+                _buildSize = message.Content.Headers.ContentRange.Length.Value;
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning?.Print(LogClass.Application, ex.Message);
+                Logger.Warning?.Print(LogClass.Application, "Couldn't determine build size for update, using single-threaded updater");
+
+                _buildSize = -1;
+            }
 
             taskDialog.Opened += (s, e) =>
             {
@@ -234,22 +242,22 @@ namespace Ryujinx.Ava.Systems
         private static void DoUpdateWithMultipleThreads(TaskDialog taskDialog, string downloadUrl, string updateFile)
         {
             // Multi-Threaded Updater
-            long chunkSize = _buildSize / ConnectionCount;
-            long remainderChunk = _buildSize % ConnectionCount;
+            long chunkSize = _buildSize / _connectionCount;
+            long remainderChunk = _buildSize % _connectionCount;
 
             int completedRequests = 0;
             int totalProgressPercentage = 0;
-            int[] progressPercentage = new int[ConnectionCount];
+            int[] progressPercentage = new int[_connectionCount];
 
-            List<byte[]> list = new(ConnectionCount);
-            List<WebClient> webClients = new(ConnectionCount);
+            List<byte[]> list = new(_connectionCount);
+            List<WebClient> webClients = new(_connectionCount);
 
-            for (int i = 0; i < ConnectionCount; i++)
+            for (int i = 0; i < _connectionCount; i++)
             {
                 list.Add([]);
             }
 
-            for (int i = 0; i < ConnectionCount; i++)
+            for (int i = 0; i < _connectionCount; i++)
             {
 #pragma warning disable SYSLIB0014
                 // TODO: WebClient is obsolete and need to be replaced with a more complex logic using HttpClient.
@@ -258,7 +266,7 @@ namespace Ryujinx.Ava.Systems
 
                 webClients.Add(client);
 
-                if (i == ConnectionCount - 1)
+                if (i == _connectionCount - 1)
                 {
                     client.Headers.Add("Range", $"bytes={chunkSize * i}-{(chunkSize * (i + 1) - 1) + remainderChunk}");
                 }
@@ -275,7 +283,7 @@ namespace Ryujinx.Ava.Systems
                     Interlocked.Exchange(ref progressPercentage[index], args.ProgressPercentage);
                     Interlocked.Add(ref totalProgressPercentage, args.ProgressPercentage);
 
-                    taskDialog.SetProgressBarState(totalProgressPercentage / ConnectionCount, TaskDialogProgressState.Normal);
+                    taskDialog.SetProgressBarState(totalProgressPercentage / _connectionCount, TaskDialogProgressState.Normal);
                 };
 
                 client.DownloadDataCompleted += (_, args) =>
@@ -294,10 +302,10 @@ namespace Ryujinx.Ava.Systems
                     list[index] = args.Result;
                     Interlocked.Increment(ref completedRequests);
 
-                    if (Equals(completedRequests, ConnectionCount))
+                    if (Equals(completedRequests, _connectionCount))
                     {
                         byte[] mergedFileBytes = new byte[_buildSize];
-                        for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < ConnectionCount; connectionIndex++)
+                        for (int connectionIndex = 0, destinationOffset = 0; connectionIndex < _connectionCount; connectionIndex++)
                         {
                             Array.Copy(list[connectionIndex], 0, mergedFileBytes, destinationOffset, list[connectionIndex].Length);
                             destinationOffset += list[connectionIndex].Length;
@@ -402,73 +410,33 @@ namespace Ryujinx.Ava.Systems
 
         [SupportedOSPlatform("linux")]
         [SupportedOSPlatform("macos")]
-        private static void ExtractTarGzipFile(TaskDialog taskDialog, string archivePath, string outputDirectoryPath)
+        private static void ExtractTarGzipFile(string archivePath, string outputDirectoryPath)
         {
             using FileStream inStream = File.OpenRead(archivePath);
-            using GZipInputStream gzipStream = new(inStream);
-            using TarInputStream tarStream = new(gzipStream, Encoding.ASCII);
-
-            TarEntry tarEntry;
-
-            while ((tarEntry = tarStream.GetNextEntry()) is not null)
-            {
-                if (tarEntry.IsDirectory)
-                {
-                    continue;
-                }
-
-                string outPath = Path.Combine(outputDirectoryPath, tarEntry.Name);
-
-                Directory.CreateDirectory(Path.GetDirectoryName(outPath));
-
-                using FileStream outStream = File.OpenWrite(outPath);
-                tarStream.CopyEntryContents(outStream);
-
-                File.SetUnixFileMode(outPath, (UnixFileMode)tarEntry.TarHeader.Mode);
-                File.SetLastWriteTime(outPath, DateTime.SpecifyKind(tarEntry.ModTime, DateTimeKind.Utc));
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    if (tarEntry is null)
-                    {
-                        return;
-                    }
-
-                    taskDialog.SetProgressBarState(GetPercentage(tarEntry.Size, inStream.Length), TaskDialogProgressState.Normal);
-                });
-            }
+            using GZipStream gzipStream = new(inStream, CompressionMode.Decompress);
+            
+            TarFile.ExtractToDirectory(gzipStream, outputDirectoryPath, true);
+        }
+        
+        [SupportedOSPlatform("linux")]
+        [SupportedOSPlatform("macos")]
+        private static void ExtractTarXzipFile(string archivePath, string outputDirectoryPath)
+        {
+            using FileStream inStream = File.OpenRead(archivePath);
+            using XZStream gzipStream = new(inStream);
+            
+            TarFile.ExtractToDirectory(gzipStream, outputDirectoryPath, true);
         }
 
-        private static void ExtractZipFile(TaskDialog taskDialog, string archivePath, string outputDirectoryPath)
+        private static void ExtractZipFile(string archivePath, string outputDirectoryPath)
         {
-            using Stream inStream = File.OpenRead(archivePath);
-            using ZipFile zipFile = new(inStream);
-
-            double count = 0;
-            foreach (ZipEntry zipEntry in zipFile)
-            {
-                count++;
-                if (zipEntry.IsDirectory)
-                {
-                    continue;
-                }
-
-                string outPath = Path.Combine(outputDirectoryPath, zipEntry.Name);
-
-                Directory.CreateDirectory(Path.GetDirectoryName(outPath));
-
-                using Stream zipStream = zipFile.GetInputStream(zipEntry);
-                using FileStream outStream = File.OpenWrite(outPath);
-
-                zipStream.CopyTo(outStream);
-
-                File.SetLastWriteTime(outPath, DateTime.SpecifyKind(zipEntry.DateTime, DateTimeKind.Utc));
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    taskDialog.SetProgressBarState(GetPercentage(count, zipFile.Count), TaskDialogProgressState.Normal);
-                });
-            }
+            ZipFile.ExtractToDirectory(archivePath, outputDirectoryPath);
+        }
+        
+        private static void Extract7ZipFile(string archivePath, string outputDirectoryPath)
+        {
+            IArchive archive = ArchiveFactory.OpenArchive(archivePath);
+            archive.WriteToDirectory(outputDirectoryPath);
         }
 
         private static void InstallUpdate(TaskDialog taskDialog, string updateFile)
@@ -479,16 +447,20 @@ namespace Ryujinx.Ava.Systems
 
             if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
             {
-                ExtractTarGzipFile(taskDialog, updateFile, _updateDir);
+                ExtractTarXzipFile(updateFile, _updateDir);
             }
             else if (OperatingSystem.IsWindows())
             {
-                ExtractZipFile(taskDialog, updateFile, _updateDir);
+                Extract7ZipFile(updateFile, _updateDir);
             }
             else
             {
                 throw new NotSupportedException();
             }
+            
+            // The new decompression implementations don't have a way to show progress
+            // so the progressbar is just set to 100% after the decompression is done
+            taskDialog.SetProgressBarState(100, TaskDialogProgressState.Normal);
 
             // Delete downloaded zip
             File.Delete(updateFile);