release: Register the game's package on activation & remove framework checks.

Author: Aetopia

src/Flarial.Launcher.Runtime/Game/Minecraft.cs

@@ -23,10 +23,9 @@ internal Minecraft() { }
     protected abstract string Window { get; }
     protected abstract string Process { get; }
 
-    public static readonly string PackageFamilyName = "Microsoft.MinecraftUWP_8wekyb3d8bbwe";
-    public static Minecraft Current => UsingGameDevelopmentKit ? s_gdk : throw new PlatformNotSupportedException();
+    public static Minecraft Current { get; } = new MinecraftGDK();
+    public static string PackageFamilyName { get; } = "Microsoft.MinecraftUWP_8wekyb3d8bbwe";
 
-    static readonly Minecraft s_gdk = new MinecraftGDK();
     internal static Package Package => PackageService.GetPackage(PackageFamilyName)!;
 
     internal static string Version
@@ -53,6 +52,8 @@ internal static string Version
     public static bool IsInstalled => Package is { };
     public static bool IsPackaged => Package.SignatureKind is PackageSignatureKind.Store;
     public static bool IsGamingServicesInstalled => PackageService.GetPackage("Microsoft.GamingServices_8wekyb3d8bbwe") is { };
+
+    [Obsolete("", true)]
     public static bool UsingGameDevelopmentKit => Package.GetAppListEntries()[0].AppUserModelId.Equals("Microsoft.MinecraftUWP_8wekyb3d8bbwe!Game", OrdinalIgnoreCase);
 
     internal static uint? GetProcessId(string target)

src/Flarial.Launcher.Runtime/Game/MinecraftGDK.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
+using Flarial.Launcher.Runtime.Services;
 using Windows.ApplicationModel;
 using Windows.Win32.Foundation;
 using static System.Environment;
@@ -35,14 +36,20 @@ static MinecraftGDK()
 
     protected override uint? Activate()
     {
-        var path = Path.Combine(Package.InstalledPath, Process);
-
-        if (!File.Exists(path))
-            throw new FileNotFoundException(null, path);
-
         if (GetProcessId() is { } processId)
             return processId;
 
+        /*
+            - Register the package to ensure it is installed.
+            - This allows the launcher to discover the game's executable.
+        */
+
+        if (!PackageService.RegisterPackage(Package))
+            throw new Win32Exception((int)ERROR_INSTALL_REGISTRATION_FAILURE);
+
+        var path = Path.Combine(Package.InstalledPath, Process);
+        if (!File.Exists(path)) throw new FileNotFoundException(null, path);
+
         /*
             - We use PowerShell to directly start the game.
             - This simplifies the activation contract.
@@ -77,11 +84,8 @@ static MinecraftGDK()
             return target.ProcessId;
         }
 
-        if (Activate() is not { } processId)
-            return null;
-
-        if (Open(PROCESS_SYNCHRONIZE, processId) is not { } process)
-            return null;
+        if (Activate() is not { } processId) return null;
+        if (Open(PROCESS_SYNCHRONIZE, processId) is not { } process) return null;
 
         using (process)
         {
@@ -95,14 +99,9 @@ static MinecraftGDK()
             {
                 while (process.Wait(1))
                 {
-                    if (GetWindow() is not { } instance)
-                        continue;
-
-                    if (instance.ProcessId != processId)
-                        continue;
-
-                    if (instance.IsVisible)
-                        return processId;
+                    if (GetWindow() is not { } instance) continue;
+                    if (instance.ProcessId != processId) continue;
+                    if (instance.IsVisible) return processId;
                 }
                 return null;
             }

src/Flarial.Launcher.Runtime/Services/PackageService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using Windows.ApplicationModel;
 using Windows.Management.Deployment;
@@ -10,14 +11,21 @@ namespace Flarial.Launcher.Runtime.Services;
 
 unsafe static class PackageService
 {
-    static readonly PackageManager s_packageManager = new();
+    static readonly PackageManager s_pm = new();
 
-    internal static Package? GetPackage(string packageFamilyName) => s_packageManager.FindPackagesForUser(string.Empty, packageFamilyName).FirstOrDefault();
+    static readonly RegisterPackageOptions s_rpo = new()
+    {
+        DeveloperMode = true,
+        ForceAppShutdown = true,
+        ForceUpdateFromAnyVersion = true
+    };
+
+    internal static Package? GetPackage(string packageFamilyName) => s_pm.FindPackagesForUser(string.Empty, packageFamilyName).FirstOrDefault();
 
-    internal static void AddPackage(Uri uri, Action<int> callback)
+    internal static bool AddPackage(Uri uri, Action<int> callback)
     {
         var handle = CreateEvent(null, true, false, null);
-        var info = s_packageManager.AddPackageAsync(uri, null, ForceApplicationShutdown | ForceUpdateFromAnyVersion);
+        var info = s_pm.AddPackageAsync(uri, null, ForceApplicationShutdown | ForceUpdateFromAnyVersion);
 
         try
         {
@@ -26,7 +34,45 @@ internal static void AddPackage(Uri uri, Action<int> callback)
 
             WaitForSingleObject(handle, INFINITE);
             if (info.Status is Error) throw info.ErrorCode;
+
+            var result = info.GetResults();
+            if (result.ExtendedErrorCode is { } @_) throw @_;
+
+            return result.IsRegistered;
+        }
+        finally
+        {
+            CloseHandle(handle);
+            info.Close();
+        }
+    }
+
+    internal static bool RegisterPackage(Package package)
+    {
+        var name = package.Id.FullName;
+
+        var options = ForceApplicationShutdown;
+        if (package.IsDevelopmentMode) options |= DevelopmentMode;
+
+        var handle = CreateEvent(null, true, false, null);
+        var info = s_pm.RegisterPackageByFullNameAsync(name, null, options);
+
+        try
+        {
+            info.Completed += (_, _) => SetEvent(handle);
+
+            WaitForSingleObject(handle, INFINITE);
+            if (info.Status is Error) throw info.ErrorCode;
+
+            var result = info.GetResults();
+            if (result.ExtendedErrorCode is { } @_) throw @_;
+
+            return result.IsRegistered;
+        }
+        finally
+        {
+            CloseHandle(handle);
+            info.Close();
         }
-        finally { CloseHandle(handle); info.Close(); }
     }
 }

src/Flarial.Launcher/Interface/Dialogs/UWPDeprecatedDialog.cs

@@ -42,7 +42,6 @@ internal async Task<ContentDialogResult> PromptAsync()
     internal static NotInstalledDialog NotInstalled => field ??= new();
     internal static LaunchFailureDialog LaunchFailure => field ??= new();
     internal static SelectVersionDialog SelectVersion => field ??= new();
-    internal static UWPDeprecatedDialog UWPDeprecated => field ??= new();
     internal static InstallVersionDialog InstallVersion => field ??= new();
     internal static UnsignedInstallDialog UnsignedInstall => field ??= new();
     internal static InvalidCustomDllDialog InvalidCustomDll => field ??= new();

src/Flarial.Launcher/Interface/MainDialog.cs

@@ -131,24 +131,16 @@ async void OnButtonClick(object sender, RoutedEventArgs args)
                 return;
             }
 
-            if (Minecraft.UsingGameDevelopmentKit)
+            if (!Minecraft.IsGamingServicesInstalled)
             {
-                if (!Minecraft.IsGamingServicesInstalled)
-                {
-                    await MainDialog.GamingServicesMissing.ShowAsync();
-                    return;
-                }
-
-                if (!Minecraft.IsPackaged)
-                {
-                    if (!await MainDialog.UnsignedInstall.ShowAsync())
-                        return;
-                }
+                await MainDialog.GamingServicesMissing.ShowAsync();
+                return;
             }
-            else
+
+            if (!Minecraft.IsPackaged)
             {
-                await MainDialog.UWPDeprecated.ShowAsync();
-                return;
+                if (!await MainDialog.UnsignedInstall.ShowAsync())
+                    return;
             }
 
             if (!custom && !registry.IsSupported)