[Setup] Update the required .NET 5 version and ignore 1638 exit code

microsoft · Feb 10, 2022 · d952661 · d952661
1 parent dbde5e3
commit d952661
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
@@ -21,7 +21,7 @@
         </BootstrapperApplicationRef>
 
         <util:FileSearch Variable="HasDotnet3122" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.22\System.Xaml.dll" Result="exists" />
-        <util:FileSearch Variable="HasDotnet5013" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\5.0.13\System.Xaml.dll" Result="exists" />
+        <util:FileSearch Variable="HasDotnet5014" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\5.0.14\System.Xaml.dll" Result="exists" />
         <util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
         <util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
 
@@ -51,6 +51,7 @@
                 Permanent="yes"
                 PerMachine="yes"
                 UninstallCommand="/uninstall /quiet">
+                <ExitCode Value="1638" Behavior="success"/>
                 <RemotePayload
                     Description="Microsoft Windows Desktop Runtime - 3.1.22 (x64)"
                     ProductName="Microsoft Windows Desktop Runtime - 3.1.22 (x64)"
@@ -59,22 +60,23 @@
                     Hash="08EF2F6CFDB33946061884B1CE13FA867EFBD576" />
             </ExePackage>
             <ExePackage
-                Name="windowsdesktop-runtime-5.0.13-win-x64.exe"
+                Name="windowsdesktop-runtime-5.0.14-win-x64.exe"
                 Compressed="no"
                 Id="DotnetRuntime5"
-                DetectCondition="HasDotnet5013"
-                DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2bfb80f2-b8f2-44b0-90c1-d3c8c1c8eac8/409dd3d3367feeeda048f4ff34b32e82/windowsdesktop-runtime-5.0.13-win-x64.exe"
+                DetectCondition="HasDotnet5014"
+                DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2887cb40-178c-4c1c-8fc1-ad5b8a29075b/33b8f9d6bbcf1b8bef4170ff101e85d0/windowsdesktop-runtime-5.0.14-win-x64.exe"
                 InstallCommand="/install /quiet"
                 RepairCommand="/repair /passive"
                 Permanent="yes"
                 PerMachine="yes"
                 UninstallCommand="/uninstall /quiet">
+                <ExitCode Value="1638" Behavior="success"/>
                 <RemotePayload
-                    Description="Microsoft Windows Desktop Runtime - 5.0.13 (x64)"
-                    ProductName="Microsoft Windows Desktop Runtime - 5.0.13 (x64)"
-                    Size="54456248"
-                    Version="5.0.13.30717"
-                    Hash="EB5506CEBB3DD1CEC78F7F8131F87A2C5F665B40" />
+                    Description="Microsoft Windows Desktop Runtime - 5.0.14 (x64)"
+                    ProductName="Microsoft Windows Desktop Runtime - 5.0.14 (x64)"
+                    Size="54932640"
+                    Version="5.0.14.30911"
+                    Hash="37C5BF69E2792E85E418A168BC319052C787AD3F" />
             </ExePackage>
             <ExePackage
                 Name="MicrosoftEdgeWebview2Setup.exe"