[Setup] Better prevent FileInUse errors during install (#12512)
This commit is contained in:
parent
b2a86db6de
commit
5e4f50fa45
1
.github/actions/spell-check/expect.txt
vendored
1
.github/actions/spell-check/expect.txt
vendored
|
@ -1301,6 +1301,7 @@ MSDN
|
|||
msedge
|
||||
mshtmdid
|
||||
msi
|
||||
MSIFASTINSTALL
|
||||
MSIHANDLE
|
||||
MSIINSTALLER
|
||||
MSIL
|
||||
|
|
|
@ -197,7 +197,8 @@
|
|||
/>
|
||||
|
||||
<!-- Close 'PowerToys.exe' before uninstall-->
|
||||
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" />
|
||||
<Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
|
||||
<Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
|
||||
<util:CloseApplication CloseMessage="yes" Target="PowerToys.exe" ElevatedCloseMessage="yes" RebootPrompt="no" TerminateProcess="0" />
|
||||
</Product>
|
||||
|
||||
|
|
|
@ -774,10 +774,14 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
|
|||
}
|
||||
processes.resize(bytes / sizeof(processes[0]));
|
||||
|
||||
std::array<std::wstring_view, 4> processesToTerminate = {
|
||||
std::array<std::wstring_view, 8> processesToTerminate = {
|
||||
L"PowerLauncher.exe",
|
||||
L"PowerToys.Settings.exe",
|
||||
L"PowerToys.Awake.exe",
|
||||
L"PowerToys.FancyZones.exe",
|
||||
L"Microsoft.PowerToys.Settings.UI.exe",
|
||||
L"FancyZonesEditor.exe",
|
||||
L"ColorPickerUI.exe",
|
||||
L"PowerToys.exe"
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue