Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Installer]Update .NET to 6.0.10 (#21487)

Browse Source
This commit is contained in:
Jaime Bernardo
2022-10-27 17:21:42 +01:00
committed by GitHub
parent 498bb3a7e2
commit 130561cfbb
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
installer/PowerToysSetup/PowerToys.wxs
View File

@@ -6,9 +6,9 @@
<?define BinDir="$(var.RepoDir)$(var.Platform)\$(var.Configuration)\" ?> <?define BinDir="$(var.RepoDir)$(var.Platform)\$(var.Configuration)\" ?>
<?define PowerToysPlatform="x64"?> <?define PowerToysPlatform="x64"?>
<?define Dotnet6DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/fe8415d4-8a35-4af9-80a5-51306a96282d/05f9b2a1b4884238e69468e49b3a5453/windowsdesktop-runtime-6.0.9-win-x64.exe"?> <?define Dotnet6DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a6e878eb-d1da-40cb-8b6a-7f5b9390f09c/e4431ce2aa28b6c9956db672209be500/windowsdesktop-runtime-6.0.10-win-x64.exe"?>
<?define Dotnet6PayloadSize="57328120"?> <?define Dotnet6PayloadSize="57361520"?>
<?define Dotnet6PayloadHash="71DD37FB8A5DF79F5EEE8983D472683F5A01F73C"?> <?define Dotnet6PayloadHash="0978D0AB85DC6F4682BA18075200F15C1C74FE02"?>
<?define PlatformProgramFiles="[ProgramFiles64Folder]"?> <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
<?else?> <?else?>
@@ -16,9 +16,9 @@
<?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?> <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
<?define PowerToysPlatform="ARM64"?> <?define PowerToysPlatform="ARM64"?>
<?define Dotnet6DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/e207429e-4cdc-43ed-868e-aeecbd1ae9d0/d32e40bb2385e7407ea235dc5541ef29/windowsdesktop-runtime-6.0.9-win-arm64.exe"?> <?define Dotnet6DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/b05a38ca-a434-473c-b031-07f05c75487e/0dfe9108f47050d81f1bc09002de6881/windowsdesktop-runtime-6.0.10-win-arm64.exe"?>
<?define Dotnet6PayloadSize="51262992"?> <?define Dotnet6PayloadSize="51265552"?>
<?define Dotnet6PayloadHash="57E51507E21B3665EF2AA8FCA77A6DDED1374837"?> <?define Dotnet6PayloadHash="A624592684361793BE6D913A9E324BA6CEE4984A"?>
<!--TODO: define to ARM64 Program files once it's available--> <!--TODO: define to ARM64 Program files once it's available-->
<?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?>
@@ -41,7 +41,7 @@
SuppressRepair="yes" /> SuppressRepair="yes" />
</BootstrapperApplicationRef> </BootstrapperApplicationRef>
<util:FileSearch Variable="HasDotnet609" Path="$(var.PlatformProgramFiles)dotnet\shared\Microsoft.WindowsDesktop.App\6.0.9\System.Xaml.dll" Result="exists" /> <util:FileSearch Variable="HasDotnet6010" Path="$(var.PlatformProgramFiles)dotnet\shared\Microsoft.WindowsDesktop.App\6.0.10\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="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" /> <util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
@@ -75,10 +75,10 @@
</ExePackage> </ExePackage>
<ExePackage <ExePackage
DisplayName="Downloading and installing .NET 6 Desktop Runtime" DisplayName="Downloading and installing .NET 6 Desktop Runtime"
Name="windowsdesktop-runtime-6.0.9-win-$(var.PowerToysPlatform).exe" Name="windowsdesktop-runtime-6.0.10-win-$(var.PowerToysPlatform).exe"
Compressed="no" Compressed="no"
Id="DotnetRuntime6" Id="DotnetRuntime6"
DetectCondition="HasDotnet609" DetectCondition="HasDotnet6010"
DownloadUrl="$(var.Dotnet6DownloadUrl)" DownloadUrl="$(var.Dotnet6DownloadUrl)"
InstallCommand="/install /quiet /norestart" InstallCommand="/install /quiet /norestart"
RepairCommand="/repair /passive /norestart" RepairCommand="/repair /passive /norestart"
@@ -87,10 +87,10 @@
UninstallCommand="/uninstall /quiet /norestart"> UninstallCommand="/uninstall /quiet /norestart">
<ExitCode Value="1638" Behavior="success"/> <ExitCode Value="1638" Behavior="success"/>
<RemotePayload <RemotePayload
Description="Microsoft Windows Desktop Runtime - 6.0.9 ($(var.PowerToysPlatform))" Description="Microsoft Windows Desktop Runtime - 6.0.10 ($(var.PowerToysPlatform))"
ProductName="Microsoft Windows Desktop Runtime - 6.0.9 ($(var.PowerToysPlatform))" ProductName="Microsoft Windows Desktop Runtime - 6.0.10 ($(var.PowerToysPlatform))"
Size="$(var.Dotnet6PayloadSize)" Size="$(var.Dotnet6PayloadSize)"
Version="6.0.9.31620" Version="6.0.10.31726"
Hash="$(var.Dotnet6PayloadHash)" /> Hash="$(var.Dotnet6PayloadHash)" />
</ExePackage> </ExePackage>
<ExePackage <ExePackage