Merge branch 'master' into 'master'

sdl2 guid, remove the CRC bytes (4 first characters) and replace with 0000 when creating guid

See merge request ryubing/ryujinx!2

src/Ryujinx.Common/ReleaseInformation.cs

@@ -1,9 +1,5 @@
-using Ryujinx.Common.Utilities;
 using System;
-using System.Net.Http;
 using System.Reflection;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 
 namespace Ryujinx.Common
 {
@@ -38,60 +34,12 @@ namespace Ryujinx.Common
 
         public static string Version => IsValid ? BuildVersion : Assembly.GetEntryAssembly()!.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
 
-        public static string GetChangelogUrl(Version currentVersion, Version newVersion, ReleaseChannels.Channel releaseChannel) =>
+        public static string GetChangelogUrl(Version currentVersion, Version newVersion) =>
             IsCanaryBuild 
                 ? $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/compare/Canary-{currentVersion}...Canary-{newVersion}" 
-                : GetChangelogForVersion(newVersion, releaseChannel);
+                : GetChangelogForVersion(newVersion);
         
-        public static string GetChangelogForVersion(Version version, ReleaseChannels.Channel releaseChannel) =>
-            $"https://github.com/{releaseChannel}/releases/{version}";
-        
-        public static async Task<ReleaseChannels> GetReleaseChannelsAsync(HttpClient httpClient)
-        {
-            ReleaseChannelPair releaseChannelPair = JsonHelper.Deserialize(await httpClient.GetStringAsync("https://ryujinx.app/api/release-channels"), ReleaseChannelPairContext.Default.ReleaseChannelPair);
-            return ReleaseChannels.Create(releaseChannelPair);
-        }
-    }
-
-    public struct ReleaseChannels
-    {
-        internal static ReleaseChannels Create(ReleaseChannelPair channelPair) =>
-            new()
-            {
-                Stable = new Channel(channelPair.Stable), 
-                Canary = new Channel(channelPair.Canary)
-            };
-
-        public Channel Stable { get; init; }
-        public Channel Canary { get; init; }
-        
-        public struct Channel
-        {
-            public Channel(string raw)
-            {
-                string[] parts = raw.Split('/');
-                Owner = parts[0];
-                Repo = parts[1];
-            }
-            
-            public string Owner;
-            public string Repo;
-
-            public override string ToString() => $"{Owner}/{Repo}";
-
-            public string GetLatestReleaseApiUrl() =>
-                $"https://api.github.com/repos/{ToString()}/releases/latest";
-        }
-    }
-    
-    [JsonSerializable(typeof(ReleaseChannelPair))]
-    partial class ReleaseChannelPairContext : JsonSerializerContext;
-
-    class ReleaseChannelPair
-    {
-        [JsonPropertyName("stable")]
-        public string Stable { get; set; }
-        [JsonPropertyName("canary")]
-        public string Canary { get; set; }
+        public static string GetChangelogForVersion(Version version) =>
+            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/{version}";
     }
 }

src/Ryujinx/Systems/Updater.cs

@@ -31,9 +31,9 @@ namespace Ryujinx.Ava.Systems
 {
     internal static class Updater
     {
-        private static ReleaseChannels.Channel? _currentReleaseChannel;
-        
         private const string GitHubApiUrl = "https://api.github.com";
+        private const string LatestReleaseUrl = 
+            $"{GitHubApiUrl}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
         
         private static readonly GithubReleasesJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
@@ -70,22 +70,13 @@ namespace Ryujinx.Ava.Systems
             }
             
             Logger.Info?.Print(LogClass.Application, "Checking for updates.");
-            
+
             // Get latest version number from GitHub API
             try
             {
                 using HttpClient jsonClient = ConstructHttpClient();
                 
-                if (_currentReleaseChannel == null)
-                {
-                    ReleaseChannels releaseChannels = await ReleaseInformation.GetReleaseChannelsAsync(jsonClient);
-
-                    _currentReleaseChannel = ReleaseInformation.IsCanaryBuild
-                        ? releaseChannels.Canary
-                        : releaseChannels.Stable;
-                }
-                
-                string fetchedJson = await jsonClient.GetStringAsync(_currentReleaseChannel.Value.GetLatestReleaseApiUrl());
+                string fetchedJson = await jsonClient.GetStringAsync(LatestReleaseUrl);
                 GithubReleasesJsonResponse fetched = JsonHelper.Deserialize(fetchedJson, _serializerContext.GithubReleasesJsonResponse);
                 _buildVer = fetched.TagName;
 
@@ -131,7 +122,7 @@ namespace Ryujinx.Ava.Systems
 
                         if (userResult is UserResult.Ok)
                         {
-                            OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion, _currentReleaseChannel.Value));
+                            OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
                         }
                     }