mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-19 06:53:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Installer]Update .NET to 6.0.11 (#22353)

Browse Source
This commit is contained in:
Jaime Bernardo 2022-11-29 12:51:52 +00:00 committed by GitHub
parent 4a087a816e
commit 21a9c82df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats 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 PowerToysPlatform="x64"?>
<?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="57361520"?>
<?define Dotnet6PayloadHash="0978D0AB85DC6F4682BA18075200F15C1C74FE02"?>
<?define Dotnet6DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/0192a249-3ec8-4374-a827-e186dd58d55d/cec046575f3eb2247a10ba3d50f5cf6c/windowsdesktop-runtime-6.0.11-win-x64.exe"?>
<?define Dotnet6PayloadSize="57217584"?>
<?define Dotnet6PayloadHash="B9E3AB8E3048170D9E3EABF6761D423EB4C93C6D"?>
<?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
<?else?>
@ -16,9 +16,9 @@
<?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
<?define PowerToysPlatform="ARM64"?>
<?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="51265552"?>
<?define Dotnet6PayloadHash="A624592684361793BE6D913A9E324BA6CEE4984A"?>
<?define Dotnet6DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/70d9846e-7bae-496c-829d-dabfda93cddd/be9e28ef860bfc7f8f36db4af4ac7692/windowsdesktop-runtime-6.0.11-win-arm64.exe"?>
<?define Dotnet6PayloadSize="51124616"?>
<?define Dotnet6PayloadHash="5222A0F11071EB0806A9745A82F820E8B950BCE3"?>
<!--TODO: define to ARM64 Program files once it's available-->
<?define PlatformProgramFiles="[ProgramFiles6432Folder]"?>
@ -41,7 +41,7 @@
SuppressRepair="yes" />
</BootstrapperApplicationRef>
<util:FileSearch Variable="HasDotnet6010" Path="$(var.PlatformProgramFiles)dotnet\shared\Microsoft.WindowsDesktop.App\6.0.10\System.Xaml.dll" Result="exists" />
<util:FileSearch Variable="HasDotnet6011" Path="$(var.PlatformProgramFiles)dotnet\shared\Microsoft.WindowsDesktop.App\6.0.11\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" />
@ -75,10 +75,10 @@
</ExePackage>
<ExePackage
DisplayName="Downloading and installing .NET 6 Desktop Runtime"
Name="windowsdesktop-runtime-6.0.10-win-$(var.PowerToysPlatform).exe"
Name="windowsdesktop-runtime-6.0.11-win-$(var.PowerToysPlatform).exe"
Compressed="no"
Id="DotnetRuntime6"
DetectCondition="HasDotnet6010"
DetectCondition="HasDotnet6011"
DownloadUrl="$(var.Dotnet6DownloadUrl)"
InstallCommand="/install /quiet /norestart"
RepairCommand="/repair /passive /norestart"
@ -87,10 +87,10 @@
UninstallCommand="/uninstall /quiet /norestart">
<ExitCode Value="1638" Behavior="success"/>
<RemotePayload
Description="Microsoft Windows Desktop Runtime - 6.0.10 ($(var.PowerToysPlatform))"
ProductName="Microsoft Windows Desktop Runtime - 6.0.10 ($(var.PowerToysPlatform))"
Description="Microsoft Windows Desktop Runtime - 6.0.11 ($(var.PowerToysPlatform))"
ProductName="Microsoft Windows Desktop Runtime - 6.0.11 ($(var.PowerToysPlatform))"
Size="$(var.Dotnet6PayloadSize)"
Version="6.0.10.31726"
Version="6.0.11.31823"
Hash="$(var.Dotnet6PayloadHash)" />
</ExePackage>
<ExePackage