Add support for AdminByRequest on Elevator (fix System.InvalidOperationException, fix #3913, related to #3441)

Co-Authored-By: Bart Jolling <[email protected]>

Author: marticliment

src/UniGetUI.Core.Settings/SettingsEngine_Names.cs

@@ -82,6 +82,7 @@ public enum K
         InstallInstalledPackagesBundlesPage,
         ProhibitElevation,
         DisableIntegrityChecks,
+        UseLegacyElevator,
 
         Test1,
         Test2,
@@ -90,7 +91,7 @@ public enum K
         Test5,
         Test6,
         Test7_Legacy,
-        Unset
+        Unset,
     };
 
     public static string ResolveKey(K key)
@@ -175,6 +176,7 @@ public static string ResolveKey(K key)
             K.InstallInstalledPackagesBundlesPage => "InstallInstalledPackagesBundlesPage",
             K.ProhibitElevation => "ProhibitElevation",
             K.DisableIntegrityChecks => "DisableIntegrityChecks",
+            K.UseLegacyElevator => "UseLegacyElevator",
 
             K.Test1 => "TestSetting1",
             K.Test2 => "TestSetting2",

src/UniGetUI/App.xaml.cs

@@ -117,8 +117,10 @@ private static async Task LoadGSudo()
                 Logger.Warn($"Using bundled GSudo at {CoreData.ElevatorPath} since UniGetUI Elevator is not available!");
                 CoreData.ElevatorPath = (await CoreTools.WhichAsync("gsudo.exe")).Item2;
 #else
-                CoreData.ElevatorPath = Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Utilities",
-                    "UniGetUI Elevator.exe");
+                string elevatorKind = Settings.Get(Settings.K.UseLegacyElevator)
+                    ? "UniGetUI Elevator (Legacy).exe"
+                    : "UniGetUI Elevator.exe";
+                CoreData.ElevatorPath = Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Utilities", elevatorKind);
                 Logger.Debug($"Using built-in UniGetUI Elevator at {CoreData.ElevatorPath}");
 #endif
             }

src/UniGetUI/Assets/Utilities/UniGetUI Elevator (Legacy).exe

@@ -55,17 +55,17 @@
 
             <widgets:SecureCheckboxCard
                 x:Name="UseUserGSudoToggle"
-                CornerRadius="8"
+                CornerRadius="8,8,0,0"
+                BorderThickness="1,1,1,0"
                 SettingName="ForceUserGSudo"
                 StateChanged="ShowRestartBanner"
                 Text="Use installed GSudo instead of UniGetUI Elevator" />
 
-            <UserControl Height="16" />
-
             <widgets:CheckboxCard
-                CornerRadius="8"
-                SettingName="DisableNewProcessLineHandler"
-                Text="Enable the new process input handler (StdIn automated closer)" />
+                CornerRadius="0,0,8,8"
+                SettingName="UseLegacyElevator"
+                Text="Use legacy UniGetUI Elevator (disable AdminByRequest support)" />
+
             <UserControl Height="16" />
 
             <widgets:CheckboxCard

src/UniGetUI/Assets/Utilities/UniGetUI Elevator.exe

@@ -179,9 +179,6 @@
     <None Update="Assets\Images\*.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\Utilities\gsudo.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Assets\Utilities\install_scoop.cmd">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -313,6 +310,9 @@
     </Content>
     <Content Update="Assets\Utilities\UniGetUI Elevator.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Utilities\UniGetUI Elevator (Legacy).exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
       <Content Update="Assets\Utilities\getfilesiginforedist.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>