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

Fix various MSI issues (#2985)

Browse Source 
* wix: add Notice.md #2442

* wix: close PowerToys which might be running during installation process #2887

* wix: update dotnet core to 3.1.4
This commit is contained in:
Andrey Nekrasov
2020-05-14 19:20:06 +03:00
committed by GitHub
parent 7a1f3a0cb1
commit 6f38cdec5a
6 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
installer/PowerToysSetup/Product.wxs
View File

@@ -91,9 +91,19 @@
<Custom Action="InstallDotNet" After="InstallFinalize">
NOT Installed
</Custom>
<Custom Action="TerminateProcesses" Before="InstallValidate" />
</InstallExecuteSequence>
<CustomAction
Id="TerminateProcesses"
Return="ignore"
Impersonate="no"
Execute="immediate"
BinaryKey="PTCustomActions"
DllEntry="TerminateProcessesCA" />
<CustomAction
Id="InstallDotNet"
FileKey="action_runner.exe"
@@ -344,6 +354,9 @@
<Component Id="License_rtf" Guid="3E5AE43B-CFB4-449B-A346-94CAAFF3312E" Win64="yes">
<File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" KeyPath="yes" />
</Component>
<Component Id="Notice_md" Guid="E2FE99F5-5DF7-44EA-8B1C-2BDF8CEC5E6D" Win64="yes">
<File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" KeyPath="yes" />
</Component>
<Component Id="powertoysinterop_dll" Guid="B7DD2DF4-C8F2-46FA-9571-D6EF1588ADF3" Win64="yes">
<File Id="PowerToysInterop.dll" KeyPath="yes" Checksum="yes" />
</Component>
@@ -695,6 +708,7 @@
<ComponentRef Id="action_runner_exe" />
<ComponentRef Id="powertoys_toast_clsid" />
<ComponentRef Id="License_rtf" />
<ComponentRef Id="Notice_md" />
<ComponentRef Id="powertoysinterop_dll" />
<ComponentRef Id="osDetection_dll" />
<ComponentRef Id="PowerToysSvgs" />