Skip to content

Commit e15ed82

Browse files
committed
WiX: revert to per-machine installs
The uninstallation path is adversely effected by the dual-purpose builds. This allows installation and uninstallation to function. While this still requires the UAC prompt, a working installation is more important. A subsequent change to enable per-user installs is still feasible.
1 parent 78b050a commit e15ed82

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

platforms/Windows/bld.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Name="Swift Build Tools"
66
UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
77
Version="$(var.ProductVersion)"
8-
Scope="perUserOrMachine">
8+
Scope="perMachine">
99
<SummaryInformation Description="Swift Build Tools" />
1010

1111
<!--

platforms/Windows/cli.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Name="Swift Command Line Tools"
66
UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
77
Version="$(var.ProductVersion)"
8-
Scope="perUserOrMachine">
8+
Scope="perMachine">
99
<SummaryInformation Description="Swift Command Line Tools" />
1010

1111
<Media Id="1" Cabinet="cli.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/dbg.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Name="Swift Debugging Tools"
66
UpgradeCode="91d382af-1e92-44dc-a4ad-aee91c1b5160"
77
Version="$(var.ProductVersion)"
8-
Scope="perUserOrMachine">
8+
Scope="perMachine">
99
<SummaryInformation Description="Swift Debugging Tools" />
1010

1111
<Media Id="1" Cabinet="dbg.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/ide.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Name="Swift IDE Integration Tools"
66
UpgradeCode="8dd91c86-d13d-490b-b06b-9522a9cf504c"
77
Version="$(var.ProductVersion)"
8-
Scope="perUserOrMachine">
8+
Scope="perMachine">
99
<SummaryInformation Description="Swift IDE Integration Tools" />
1010

1111
<Media Id="1" Cabinet="ide.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/runtime.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Name="Swift Windows Runtime ($(var.ProcessorArchitecture))"
77
UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
88
Version="$(var.ProductVersion)"
9-
Scope="perUserOrMachine">
9+
Scope="perMachine">
1010
<SummaryInformation Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" />
1111

1212
<Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" CompressionLevel="high" />

platforms/Windows/sdk.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Name="Swift Windows SDK ($(var.ProcessorArchitecture))"
77
UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
88
Version="$(var.ProductVersion)"
9-
Scope="perUserOrMachine">
9+
Scope="perMachine">
1010
<SummaryInformation Description="Swift Windows SDK ($(var.ProcessorArchitecture))" />
1111

1212
<Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" CompressionLevel="high" />

0 commit comments

Comments
 (0)