@joebigelow / wix / commits / 174043e6

Fix Condition authoring.

Bob Arnson committed Sep 2, 2020 at 17:41 UTC 174043e6f961c5c63fb89a1995b469f03be7894d
15 files changed +47 -70
global.json
+1 -1
@@ -1,5 +1,5 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0143"
3 + "WixToolset.Sdk": "4.0.0-build-0154"
4 }
5 }
src/wixlib/NetFx4.5.wxs
+3 -5
@@ -24,9 +24,7 @@
24 <Fragment>
25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
26 <Property Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Secure="yes" />
27 - <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch">
28 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx45MinRelease)"
29 - </SetProperty>
27 + <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx45MinRelease)&quot;" />
28 </Fragment>
29
30 <Fragment>
@@ -40,7 +38,7 @@
38 </Fragment>
39
40 <Fragment>
43 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
41 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
42
43 <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
44 <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" />
@@ -81,7 +79,7 @@
79 </Fragment>
80
81 <Fragment>
84 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
82 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
83
84 <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
85 <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx4.wxs
+5 -7
@@ -27,9 +27,7 @@
27 <Fragment>
28 <PropertyRef Id="NETFRAMEWORK40FULL" />
29 <Property Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Secure="yes" />
30 - <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch">
31 - NETFRAMEWORK40FULL
32 - </SetProperty>
30 + <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="NETFRAMEWORK40FULL" />
31 </Fragment>
32
33 <Fragment>
@@ -43,7 +41,7 @@
41 </Fragment>
42
43 <Fragment>
46 - <util:RegistrySearchRef Id="NETFRAMEWORK40"/>
44 + <util:RegistrySearchRef Id="NETFRAMEWORK40" />
45
46 <PackageGroup Id="$(var.NetFx40WebId)">
47 <ExePackage
@@ -78,7 +76,7 @@
76 </Fragment>
77
78 <Fragment>
81 - <util:RegistrySearchRef Id="NETFRAMEWORK40"/>
79 + <util:RegistrySearchRef Id="NETFRAMEWORK40" />
80
81 <PackageGroup Id="$(var.NetFx40RedistId)">
82 <ExePackage
@@ -123,7 +121,7 @@
121 </Fragment>
122
123 <Fragment>
126 - <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
124 + <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
125
126 <PackageGroup Id="$(var.NetFx40ClientWebId)">
127 <ExePackage
@@ -158,7 +156,7 @@
156 </Fragment>
157
158 <Fragment>
161 - <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
159 + <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
160
161 <PackageGroup Id="$(var.NetFx40ClientRedistId)">
162 <ExePackage
src/wixlib/NetFx451.wxs
+3 -5
@@ -24,13 +24,11 @@
24 <Fragment>
25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
26 <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" />
27 - <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch">
28 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx451MinRelease)"
29 - </SetProperty>
27 + <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx451MinRelease)&quot;" />
28 </Fragment>
29
30 <Fragment>
33 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
31 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
32
33 <WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
34 <WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
@@ -71,7 +69,7 @@
69 </Fragment>
70
71 <Fragment>
74 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
72 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
73
74 <WixVariable Id="NetFx451RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
75 <WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx452.wxs
+3 -5
@@ -23,13 +23,11 @@
23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" />
26 - <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch">
27 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx452MinRelease)"
28 - </SetProperty>
26 + <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
27 </Fragment>
28
29 <Fragment>
32 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
30 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
31
32 <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
33 <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
@@ -69,7 +67,7 @@
67 </Fragment>
68
69 <Fragment>
72 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
70 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
71
72 <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
73 <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx46.wxs
+3 -5
@@ -24,13 +24,11 @@
24 <Fragment>
25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
26 <Property Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Secure="yes" />
27 - <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch">
28 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)"
29 - </SetProperty>
27 + <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx46MinRelease)&quot;" />
28 </Fragment>
29
30 <Fragment>
33 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
31 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
32
33 <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
34 <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" />
@@ -71,7 +69,7 @@
69 </Fragment>
70
71 <Fragment>
74 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
72 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
73
74 <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
75 <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx461.wxs
+3 -5
@@ -23,13 +23,11 @@
23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" />
26 - <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch">
27 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx461MinRelease)"
28 - </SetProperty>
26 + <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx461MinRelease)&quot;" />
27 </Fragment>
28
29 <Fragment>
32 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
30 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
31
32 <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
33 <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" />
@@ -70,7 +68,7 @@
68 </Fragment>
69
70 <Fragment>
73 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
71 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
72
73 <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
74 <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx462.wxs
+3 -5
@@ -23,13 +23,11 @@
23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Secure="yes" />
26 - <SetProperty Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Value="1" After="AppSearch">
27 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx462MinRelease)"
28 - </SetProperty>
26 + <SetProperty Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx462MinRelease)&quot;" />
27 </Fragment>
28
29 <Fragment>
32 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
30 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
31
32 <WixVariable Id="NetFx462WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
33 <WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" />
@@ -70,7 +68,7 @@
68 </Fragment>
69
70 <Fragment>
73 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
71 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
72
73 <WixVariable Id="NetFx462RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
74 <WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx47.wxs
+1 -3
@@ -18,8 +18,6 @@
18 <Fragment>
19 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
20 <Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
21 - <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch">
22 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
23 - </SetProperty>
21 + <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx47MinRelease)&quot;" />
22 </Fragment>
23 </Wix>
src/wixlib/NetFx471.wxs
+1 -3
@@ -18,8 +18,6 @@
18 <Fragment>
19 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
20 <Property Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Secure="yes" />
21 - <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch">
22 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx471MinRelease)"
23 - </SetProperty>
21 + <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx471MinRelease)&quot;" />
22 </Fragment>
23 </Wix>
src/wixlib/NetFx472.wxs
+3 -5
@@ -21,13 +21,11 @@
21 <Fragment>
22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
23 <Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" />
24 - <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch">
25 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx472MinRelease)"
26 - </SetProperty>
24 + <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx472MinRelease)&quot;" />
25 </Fragment>
26
27 <Fragment>
30 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
28 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
29
30 <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
31 <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
@@ -68,7 +66,7 @@
66 </Fragment>
67
68 <Fragment>
71 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
69 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
70
71 <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
72 <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFx48.wxs
+3 -5
@@ -21,13 +21,11 @@
21 <Fragment>
22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
23 <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" />
24 - <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch">
25 - WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)"
26 - </SetProperty>
24 + <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx48MinRelease)&quot;" />
25 </Fragment>
26
27 <Fragment>
30 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
28 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
29
30 <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
31 <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
@@ -68,7 +66,7 @@
66 </Fragment>
67
68 <Fragment>
71 - <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
69 + <util:RegistrySearchRef Id="NETFRAMEWORK45" />
70
71 <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
72 <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
src/wixlib/NetFxExtension_Platform.wxi
+4 -4
@@ -15,10 +15,10 @@
15
16 <InstallExecuteSequence>
17 <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" />
18 - <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes">RollbackDisabled &lt;&gt; 1</Custom>
19 - <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes">RollbackDisabled = 1</Custom>
20 - <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes">RollbackDisabled &lt;&gt; 1</Custom>
21 - <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes">RollbackDisabled = 1</Custom>
18 + <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
19 + <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
20 + <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
21 + <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
22 </InstallExecuteSequence>
23 </Fragment>
24
src/wixlib/caDecor.wxi
+10 -11
@@ -1,40 +1,39 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
5 -<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
4 +<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?ifdef Prefix ?>
6 <?undef Prefix ?>
8 - <?endif ?>
7 + <?endif?>
8
9 <?define Prefix="Wix4" ?>
10
11 <?ifndef platform ?>
12 <?define platform="x86" ?>
14 - <?endif ?>
13 + <?endif?>
14
15 <?if $(var.platform)="" ?>
16 <?undef platform ?>
17 <?define platform="x86" ?>
19 - <?endif ?>
18 + <?endif?>
19
20 <?ifdef Suffix ?>
21 <?undef Suffix ?>
23 - <?endif ?>
22 + <?endif?>
23
24 <?if $(var.platform)~="x86" ?>
25 <?define Suffix="_X86" ?>
27 - <?endif ?>
26 + <?endif?>
27
28 <?if $(var.platform)~="x64" ?>
29 <?define Suffix="_X64" ?>
31 - <?endif ?>
30 + <?endif?>
31
32 <?if $(var.platform)~="arm" ?>
33 <?define Suffix="_A32" ?>
35 - <?endif ?>
34 + <?endif?>
35
36 <?if $(var.platform)~="arm64" ?>
37 <?define Suffix="_A64" ?>
39 - <?endif ?>
38 + <?endif?>
39 </Include>
src/wixlib/netfx.wixproj
+1 -1
@@ -7,7 +7,7 @@
7 </PropertyGroup>
8
9 <ItemGroup>
10 - <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
10 + <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12 <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
13 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />