aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-09-02 17:41:20 -0400
committerBob Arnson <bob@firegiant.com>2020-09-02 17:43:25 -0400
commit174043e6f961c5c63fb89a1995b469f03be7894d (patch)
tree104a9e68e0a66317ebe3ebeb10bb0c3df9a1034d
parent16e749977b812daeae17615879d95333143a4c1f (diff)
downloadwix-174043e6f961c5c63fb89a1995b469f03be7894d.tar.gz
wix-174043e6f961c5c63fb89a1995b469f03be7894d.tar.bz2
wix-174043e6f961c5c63fb89a1995b469f03be7894d.zip
Fix Condition authoring.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/wixlib/NetFx4.5.wxs8
-rw-r--r--src/wixlib/NetFx4.wxs12
-rw-r--r--src/wixlib/NetFx451.wxs8
-rw-r--r--src/wixlib/NetFx452.wxs8
-rw-r--r--src/wixlib/NetFx46.wxs8
-rw-r--r--src/wixlib/NetFx461.wxs8
-rw-r--r--src/wixlib/NetFx462.wxs8
-rw-r--r--src/wixlib/NetFx47.wxs4
-rw-r--r--src/wixlib/NetFx471.wxs4
-rw-r--r--src/wixlib/NetFx472.wxs8
-rw-r--r--src/wixlib/NetFx48.wxs8
-rw-r--r--src/wixlib/NetFxExtension_Platform.wxi8
-rw-r--r--src/wixlib/caDecor.wxi21
-rw-r--r--src/wixlib/netfx.wixproj2
15 files changed, 47 insertions, 70 deletions
diff --git a/global.json b/global.json
index 7a995d0a..1ba230a5 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0143" 3 "WixToolset.Sdk": "4.0.0-build-0154"
4 } 4 }
5} 5}
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs
index d2ee09cd..ace065e2 100644
--- a/src/wixlib/NetFx4.5.wxs
+++ b/src/wixlib/NetFx4.5.wxs
@@ -24,9 +24,7 @@
24 <Fragment> 24 <Fragment>
25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
26 <Property Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Secure="yes" /> 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"> 27 <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx45MinRelease)&quot;" />
28 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx45MinRelease)"
29 </SetProperty>
30 </Fragment> 28 </Fragment>
31 29
32 <Fragment> 30 <Fragment>
@@ -40,7 +38,7 @@
40 </Fragment> 38 </Fragment>
41 39
42 <Fragment> 40 <Fragment>
43 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 41 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
44 42
45 <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" /> 43 <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
46 <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" /> 44 <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" />
@@ -81,7 +79,7 @@
81 </Fragment> 79 </Fragment>
82 80
83 <Fragment> 81 <Fragment>
84 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 82 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
85 83
86 <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" /> 84 <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
87 <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" /> 85 <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs
index cad4a31c..047915b9 100644
--- a/src/wixlib/NetFx4.wxs
+++ b/src/wixlib/NetFx4.wxs
@@ -27,9 +27,7 @@
27 <Fragment> 27 <Fragment>
28 <PropertyRef Id="NETFRAMEWORK40FULL" /> 28 <PropertyRef Id="NETFRAMEWORK40FULL" />
29 <Property Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Secure="yes" /> 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"> 30 <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="NETFRAMEWORK40FULL" />
31 NETFRAMEWORK40FULL
32 </SetProperty>
33 </Fragment> 31 </Fragment>
34 32
35 <Fragment> 33 <Fragment>
@@ -43,7 +41,7 @@
43 </Fragment> 41 </Fragment>
44 42
45 <Fragment> 43 <Fragment>
46 <util:RegistrySearchRef Id="NETFRAMEWORK40"/> 44 <util:RegistrySearchRef Id="NETFRAMEWORK40" />
47 45
48 <PackageGroup Id="$(var.NetFx40WebId)"> 46 <PackageGroup Id="$(var.NetFx40WebId)">
49 <ExePackage 47 <ExePackage
@@ -78,7 +76,7 @@
78 </Fragment> 76 </Fragment>
79 77
80 <Fragment> 78 <Fragment>
81 <util:RegistrySearchRef Id="NETFRAMEWORK40"/> 79 <util:RegistrySearchRef Id="NETFRAMEWORK40" />
82 80
83 <PackageGroup Id="$(var.NetFx40RedistId)"> 81 <PackageGroup Id="$(var.NetFx40RedistId)">
84 <ExePackage 82 <ExePackage
@@ -123,7 +121,7 @@
123 </Fragment> 121 </Fragment>
124 122
125 <Fragment> 123 <Fragment>
126 <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/> 124 <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
127 125
128 <PackageGroup Id="$(var.NetFx40ClientWebId)"> 126 <PackageGroup Id="$(var.NetFx40ClientWebId)">
129 <ExePackage 127 <ExePackage
@@ -158,7 +156,7 @@
158 </Fragment> 156 </Fragment>
159 157
160 <Fragment> 158 <Fragment>
161 <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/> 159 <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
162 160
163 <PackageGroup Id="$(var.NetFx40ClientRedistId)"> 161 <PackageGroup Id="$(var.NetFx40ClientRedistId)">
164 <ExePackage 162 <ExePackage
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs
index dc2b1fd6..36b6bab9 100644
--- a/src/wixlib/NetFx451.wxs
+++ b/src/wixlib/NetFx451.wxs
@@ -24,13 +24,11 @@
24 <Fragment> 24 <Fragment>
25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
26 <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" /> 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"> 27 <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx451MinRelease)&quot;" />
28 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx451MinRelease)"
29 </SetProperty>
30 </Fragment> 28 </Fragment>
31 29
32 <Fragment> 30 <Fragment>
33 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 31 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
34 32
35 <WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" /> 33 <WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
36 <WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" /> 34 <WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
@@ -71,7 +69,7 @@
71 </Fragment> 69 </Fragment>
72 70
73 <Fragment> 71 <Fragment>
74 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 72 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
75 73
76 <WixVariable Id="NetFx451RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" /> 74 <WixVariable Id="NetFx451RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
77 <WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" /> 75 <WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 260f8ab1..8dbdd9b3 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.wxs
@@ -23,13 +23,11 @@
23 <Fragment> 23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" /> 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"> 26 <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
27 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx452MinRelease)"
28 </SetProperty>
29 </Fragment> 27 </Fragment>
30 28
31 <Fragment> 29 <Fragment>
32 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 30 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
33 31
34 <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" /> 32 <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
35 <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" /> 33 <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
@@ -69,7 +67,7 @@
69 </Fragment> 67 </Fragment>
70 68
71 <Fragment> 69 <Fragment>
72 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 70 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
73 71
74 <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" /> 72 <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
75 <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" /> 73 <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs
index a874ed95..5c875d09 100644
--- a/src/wixlib/NetFx46.wxs
+++ b/src/wixlib/NetFx46.wxs
@@ -24,13 +24,11 @@
24 <Fragment> 24 <Fragment>
25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 25 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
26 <Property Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Secure="yes" /> 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"> 27 <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx46MinRelease)&quot;" />
28 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)"
29 </SetProperty>
30 </Fragment> 28 </Fragment>
31 29
32 <Fragment> 30 <Fragment>
33 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 31 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
34 32
35 <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" /> 33 <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
36 <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" /> 34 <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" />
@@ -71,7 +69,7 @@
71 </Fragment> 69 </Fragment>
72 70
73 <Fragment> 71 <Fragment>
74 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 72 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
75 73
76 <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" /> 74 <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
77 <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" /> 75 <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs
index 52231a40..ec5a405c 100644
--- a/src/wixlib/NetFx461.wxs
+++ b/src/wixlib/NetFx461.wxs
@@ -23,13 +23,11 @@
23 <Fragment> 23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" /> 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"> 26 <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx461MinRelease)&quot;" />
27 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx461MinRelease)"
28 </SetProperty>
29 </Fragment> 27 </Fragment>
30 28
31 <Fragment> 29 <Fragment>
32 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 30 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
33 31
34 <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" /> 32 <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
35 <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" /> 33 <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" />
@@ -70,7 +68,7 @@
70 </Fragment> 68 </Fragment>
71 69
72 <Fragment> 70 <Fragment>
73 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 71 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
74 72
75 <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" /> 73 <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
76 <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" /> 74 <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index e8628b15..fc3aa158 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.wxs
@@ -23,13 +23,11 @@
23 <Fragment> 23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Secure="yes" /> 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"> 26 <SetProperty Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx462MinRelease)&quot;" />
27 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx462MinRelease)"
28 </SetProperty>
29 </Fragment> 27 </Fragment>
30 28
31 <Fragment> 29 <Fragment>
32 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 30 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
33 31
34 <WixVariable Id="NetFx462WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" /> 32 <WixVariable Id="NetFx462WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
35 <WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" /> 33 <WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" />
@@ -70,7 +68,7 @@
70 </Fragment> 68 </Fragment>
71 69
72 <Fragment> 70 <Fragment>
73 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 71 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
74 72
75 <WixVariable Id="NetFx462RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" /> 73 <WixVariable Id="NetFx462RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
76 <WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" /> 74 <WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx47.wxs b/src/wixlib/NetFx47.wxs
index 2f4966ad..97f31500 100644
--- a/src/wixlib/NetFx47.wxs
+++ b/src/wixlib/NetFx47.wxs
@@ -18,8 +18,6 @@
18 <Fragment> 18 <Fragment>
19 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 19 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
20 <Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" /> 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"> 21 <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx47MinRelease)&quot;" />
22 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
23 </SetProperty>
24 </Fragment> 22 </Fragment>
25</Wix> 23</Wix>
diff --git a/src/wixlib/NetFx471.wxs b/src/wixlib/NetFx471.wxs
index 3fd99aa3..b5d2c659 100644
--- a/src/wixlib/NetFx471.wxs
+++ b/src/wixlib/NetFx471.wxs
@@ -18,8 +18,6 @@
18 <Fragment> 18 <Fragment>
19 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 19 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
20 <Property Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Secure="yes" /> 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"> 21 <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx471MinRelease)&quot;" />
22 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx471MinRelease)"
23 </SetProperty>
24 </Fragment> 22 </Fragment>
25</Wix> 23</Wix>
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index 08a17d5b..5aaa1976 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.wxs
@@ -21,13 +21,11 @@
21 <Fragment> 21 <Fragment>
22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
23 <Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" /> 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"> 24 <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx472MinRelease)&quot;" />
25 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx472MinRelease)"
26 </SetProperty>
27 </Fragment> 25 </Fragment>
28 26
29 <Fragment> 27 <Fragment>
30 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 28 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
31 29
32 <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" /> 30 <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
33 <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" /> 31 <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
@@ -68,7 +66,7 @@
68 </Fragment> 66 </Fragment>
69 67
70 <Fragment> 68 <Fragment>
71 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 69 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
72 70
73 <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" /> 71 <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
74 <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" /> 72 <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index d65d36be..acc79a31 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -21,13 +21,11 @@
21 <Fragment> 21 <Fragment>
22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 22 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
23 <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" /> 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"> 24 <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx48MinRelease)&quot;" />
25 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)"
26 </SetProperty>
27 </Fragment> 25 </Fragment>
28 26
29 <Fragment> 27 <Fragment>
30 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 28 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
31 29
32 <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" /> 30 <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
33 <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" /> 31 <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
@@ -68,7 +66,7 @@
68 </Fragment> 66 </Fragment>
69 67
70 <Fragment> 68 <Fragment>
71 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 69 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
72 70
73 <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" /> 71 <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
74 <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" /> 72 <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFxExtension_Platform.wxi b/src/wixlib/NetFxExtension_Platform.wxi
index 92b13dad..96f03d44 100644
--- a/src/wixlib/NetFxExtension_Platform.wxi
+++ b/src/wixlib/NetFxExtension_Platform.wxi
@@ -15,10 +15,10 @@
15 15
16 <InstallExecuteSequence> 16 <InstallExecuteSequence>
17 <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" /> 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> 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">RollbackDisabled = 1</Custom> 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">RollbackDisabled &lt;&gt; 1</Custom> 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">RollbackDisabled = 1</Custom> 21 <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
22 </InstallExecuteSequence> 22 </InstallExecuteSequence>
23 </Fragment> 23 </Fragment>
24 24
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
index 1d00df8f..b1711518 100644
--- a/src/wixlib/caDecor.wxi
+++ b/src/wixlib/caDecor.wxi
@@ -1,40 +1,39 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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. -->
3 2
4 3
5<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?ifdef Prefix ?> 5 <?ifdef Prefix ?>
7 <?undef Prefix ?> 6 <?undef Prefix ?>
8 <?endif ?> 7 <?endif?>
9 8
10 <?define Prefix="Wix4" ?> 9 <?define Prefix="Wix4" ?>
11 10
12 <?ifndef platform ?> 11 <?ifndef platform ?>
13 <?define platform="x86" ?> 12 <?define platform="x86" ?>
14 <?endif ?> 13 <?endif?>
15 14
16 <?if $(var.platform)="" ?> 15 <?if $(var.platform)="" ?>
17 <?undef platform ?> 16 <?undef platform ?>
18 <?define platform="x86" ?> 17 <?define platform="x86" ?>
19 <?endif ?> 18 <?endif?>
20 19
21 <?ifdef Suffix ?> 20 <?ifdef Suffix ?>
22 <?undef Suffix ?> 21 <?undef Suffix ?>
23 <?endif ?> 22 <?endif?>
24 23
25 <?if $(var.platform)~="x86" ?> 24 <?if $(var.platform)~="x86" ?>
26 <?define Suffix="_X86" ?> 25 <?define Suffix="_X86" ?>
27 <?endif ?> 26 <?endif?>
28 27
29 <?if $(var.platform)~="x64" ?> 28 <?if $(var.platform)~="x64" ?>
30 <?define Suffix="_X64" ?> 29 <?define Suffix="_X64" ?>
31 <?endif ?> 30 <?endif?>
32 31
33 <?if $(var.platform)~="arm" ?> 32 <?if $(var.platform)~="arm" ?>
34 <?define Suffix="_A32" ?> 33 <?define Suffix="_A32" ?>
35 <?endif ?> 34 <?endif?>
36 35
37 <?if $(var.platform)~="arm64" ?> 36 <?if $(var.platform)~="arm64" ?>
38 <?define Suffix="_A64" ?> 37 <?define Suffix="_A64" ?>
39 <?endif ?> 38 <?endif?>
40</Include> 39</Include>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index faf539a7..426446e8 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -7,7 +7,7 @@
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <ItemGroup> 9 <ItemGroup>
10 <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' /> 10 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> 11 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12 <BindInputPaths Include="$(OutputPath)arm" BindName='arm' /> 12 <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
13 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> 13 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 05:34:18 +0000