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

[Installer]Upgrade .net framework to 6.0.3 (#17051)

Browse Source 
* Revert "[PTRun]Workaround fix tooltip crash on .net 6 (#16629)"

This reverts commit b4250c1235.

* Upgrade .net framework to 6.0.3
This commit is contained in:
Jaime Bernardo
2022-03-16 10:54:01 +00:00
committed by GitHub
parent d66fac3c3c
commit cfdaea4363
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
installer/PowerToysSetup/PowerToys.wxs
View File

@@ -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="HasDotnet602" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\6.0.2\System.Xaml.dll" Result="exists" />
<util:FileSearch Variable="HasDotnet603" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\6.0.3\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" />
@@ -60,11 +60,11 @@
Hash="08EF2F6CFDB33946061884B1CE13FA867EFBD576" />
</ExePackage>
<ExePackage
Name="windowsdesktop-runtime-6.0.2-win-x64.exe"
Name="windowsdesktop-runtime-6.0.3-win-x64.exe"
Compressed="no"
Id="DotnetRuntime6"
DetectCondition="HasDotnet602"
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/efa32b7a-6eec-4d97-9cdc-c7336a29a749/3df4296170397cf60884dae1be3d103b/windowsdesktop-runtime-6.0.2-win-x64.exe"
DetectCondition="HasDotnet603"
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/7f3a766e-9516-4579-aaf2-2b150caa465c/d57665f880cdcce816b278a944092965/windowsdesktop-runtime-6.0.3-win-x64.exe"
InstallCommand="/install /quiet /norestart"
RepairCommand="/repair /passive /norestart"
Permanent="yes"
@@ -72,11 +72,11 @@
UninstallCommand="/uninstall /quiet /norestart">
<ExitCode Value="1638" Behavior="success"/>
<RemotePayload
Description="Microsoft Windows Desktop Runtime - 6.0.2 (x64)"
ProductName="Microsoft Windows Desktop Runtime - 6.0.2 (x64)"
Size="57296456"
Version="6.0.2.30914"
Hash="EA8DB9D01555D0EA2A3D3CD41D56A28199A064F5" />
Description="Microsoft Windows Desktop Runtime - 6.0.3 (x64)"
ProductName="Microsoft Windows Desktop Runtime - 6.0.3 (x64)"
Size="57153808"
Version="6.0.3.31024"
Hash="85EB71B760EBA108348824A4928ED2BA9775BE76" />
</ExePackage>
<ExePackage
Name="MicrosoftEdgeWebview2Setup.exe"

2
src/modules/launcher/PowerLauncher/ResultList.xaml
View File

@@ -190,7 +190,7 @@
Width="642"
Background="Transparent"
ToolTipService.BetweenShowDelay="0"
ToolTipService.InitialShowDelay="0">
ToolTipService.InitialShowDelay="1000">
<Behaviors:Interaction.Triggers>
<Behaviors:EventTrigger EventName="MouseEnter">
<Behaviors:InvokeCommandAction Command="{Binding ActivateContextButtonsHoverCommand}"/>