Use elevator NuGet assets for Windows release packaging (#4567)

* Use elevator NuGet package for bundled DLL

* update gsudo license urls

* Bump elevator package to 2.6.1.1

Author: mamoreau-devolutions

InstallerExtras/CodeDependencies.iss

@@ -232,20 +232,29 @@ begin
     Dependency_Add('vcredist2022' + Dependency_ArchSuffix + '.exe',
       '/passive /norestart',
       'Visual C++ 2015-2022 Redistributable (x64)' + Dependency_ArchTitle,
-      Dependency_String('https://aka.ms/vs/17/release/vc_redist.x64.exe', 'https://aka.ms/vs/17/release/vc_redist.x64.exe'),
+      Dependency_String('https://aka.ms/vc14/vc_redist.x64.exe', 'https://aka.ms/vc14/vc_redist.x64.exe'),
       '', False, False);
   end;
 end;
 
 
 procedure Dependency_AddWebView2;
+var
+  WebView2URL, WebView2Title: String;
 begin
   // https://developer.microsoft.com/en-us/microsoft-edge/webview2
   if not RegValueExists(HKLM, Dependency_String('SOFTWARE', 'SOFTWARE\WOW6432Node') + '\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}', 'pv') then begin
+    if IsARM64 then begin
+      WebView2URL := 'https://go.microsoft.com/fwlink/?linkid=2099616';
+      WebView2Title := 'WebView2 Runtime (ARM64)';
+    end else begin
+      WebView2URL := 'https://go.microsoft.com/fwlink/?linkid=2124701';
+      WebView2Title := 'WebView2 Runtime (x64)';
+    end;
     Dependency_Add('MicrosoftEdgeWebview2Setup.exe',
       '/silent /install',
-      'WebView2 Runtime (x64)',
-      'https://go.microsoft.com/fwlink/?linkid=2124701',
+      WebView2Title,
+      WebView2URL,
       '', False, False);
   end;
 end;

src/UniGetUI.Core.Data/Licenses.cs

@@ -93,7 +93,7 @@ public static class LicenseData
             { "GSudo", new Uri("https://github.com/gerardog/gsudo/blob/master/LICENSE.txt") },
             {
                 "UniGetUI Elevator",
-                new Uri("https://github.com/marticliment/GSudo-for-UniGetUI/blob/main/LICENSE.txt")
+                new Uri("https://github.com/Devolutions/gsudo-distro/blob/master/LICENSE")
             },
             { "Icons", new Uri("https://icons8.com/license") },
         };
@@ -131,7 +131,7 @@ public static class LicenseData
             { "vcpkg", new Uri("https://github.com/microsoft/vcpkg") },
             // Other
             { "GSudo", new Uri("https://github.com/gerardog/gsudo/") },
-            { "UniGetUI Elevator", new Uri("https://github.com/marticliment/GSudo-for-UniGetUI/") },
+            { "UniGetUI Elevator", new Uri("https://github.com/Devolutions/gsudo-distro") },
             { "Icons", new Uri("https://icons8.com") },
         };
     }

src/UniGetUI/Assets/Utilities/getfilesiginforedist.dll

@@ -34,7 +34,9 @@
         <ElevatorPackageArchitecture Condition="'$(ElevatorPackageArchitecture)' == ''"
             >x64</ElevatorPackageArchitecture
         >
-        <ElevatorPackageExePath>$(PkgDevolutions_UniGetUI_Elevator)\runtimes\win-$(ElevatorPackageArchitecture)\native\UniGetUI Elevator.exe</ElevatorPackageExePath>
+        <ElevatorPackageNativePath>$(PkgDevolutions_UniGetUI_Elevator)\runtimes\win-$(ElevatorPackageArchitecture)\native</ElevatorPackageNativePath>
+        <ElevatorPackageExePath>$(ElevatorPackageNativePath)\UniGetUI Elevator.exe</ElevatorPackageExePath>
+        <ElevatorPackageDllPath>$(ElevatorPackageNativePath)\getfilesiginforedist.dll</ElevatorPackageDllPath>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -71,6 +73,10 @@
             Condition="!Exists('$(ElevatorPackageExePath)')"
             Text="NuGet elevator executable not found at '$(ElevatorPackageExePath)'. Ensure package restore has completed for Devolutions.UniGetUI.Elevator."
         />
+        <Error
+            Condition="!Exists('$(ElevatorPackageDllPath)')"
+            Text="NuGet elevator dependency DLL not found at '$(ElevatorPackageDllPath)'. Ensure package restore has completed for Devolutions.UniGetUI.Elevator."
+        />
     </Target>
 
     <ItemGroup>
@@ -151,7 +157,7 @@
         <PackageReference Include="Octokit" Version="14.0.0" />
         <PackageReference
             Include="Devolutions.UniGetUI.Elevator"
-            Version="2.6.1"
+            Version="2.6.1.1"
             GeneratePathProperty="true"
             ExcludeAssets="build;buildTransitive"
         />
@@ -365,10 +371,14 @@
             <Pack>false</Pack>
         </Content>
         <Content
-            Update="Assets\Utilities\getfilesiginforedist.dll"
-            Condition="'$(Platform)' == 'x64'"
+            Include="$(ElevatorPackageDllPath)"
+            Link="Assets\Utilities\getfilesiginforedist.dll"
+            Condition="Exists('$(ElevatorPackageDllPath)')"
         >
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+            <Visible>false</Visible>
+            <Pack>false</Pack>
         </Content>
         <Content Update="Assets\Utilities\install_scoop.cmd">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>