Move MBA prereq info back into NetFx.
Sean Hall committed
Apr 23, 2020 at 12:28 UTC
f2e8523f44eeb88e418c93f00715896d663dc256
10 files changed
+176
-41
nuget.config
+1
@@ -10,6 +10,7 @@
10
<add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
11
<add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" />
12
<add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" />
13
+ <add key="wixtoolset-bal-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-bal-wixext" />
14
<add key="wixtoolset-util-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-util-wixext" />
15
<add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
16
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
src/wixlib/NetFx4.5.wxs
+22
-5
@@ -2,7 +2,9 @@
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
4
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
7
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
8
9
<!--
10
.NET Framework installation state properties
@@ -15,6 +17,9 @@
17
<?define NetFx45MinRelease = 378389?>
18
<?define NetFx45WebLink = http://go.microsoft.com/fwlink/?LinkId=225704 ?>
19
<?define NetFx45RedistLink = http://go.microsoft.com/fwlink/?LinkId=225702 ?>
20
+ <?define NetFx45EulaLink = http://go.microsoft.com/fwlink/?LinkID=260867 ?>
21
+ <?define NetFx45WebId = NetFx45Web ?>
22
+ <?define NetFx45RedistId = NetFx45Redist ?>
23
24
<Fragment>
25
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -41,7 +46,7 @@
46
<WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" />
47
<WixVariable Id="NetFx45WebPackageDirectory" Value="redist\" Overridable="yes" />
48
44
- <PackageGroup Id="NetFx45Web">
49
+ <PackageGroup Id="$(var.NetFx45WebId)">
50
<ExePackage
51
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html""
52
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html""
@@ -49,7 +54,7 @@
54
PerMachine="yes"
55
DetectCondition="!(wix.NetFx45WebDetectCondition)"
56
InstallCondition="!(wix.NetFx45WebInstallCondition)"
52
- Id="NetFx45Web"
57
+ Id="$(var.NetFx45WebId)"
58
Vital="yes"
59
Permanent="yes"
60
Protocol="netfx4"
@@ -69,6 +74,12 @@
74
</PackageGroup>
75
</Fragment>
76
77
+ <Fragment>
78
+ <PackageGroup Id="$(var.NetFx45WebId)AsPrereq" />
79
+
80
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" />
81
+ </Fragment>
82
+
83
<Fragment>
84
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
85
@@ -76,7 +87,7 @@
87
<WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" />
88
<WixVariable Id="NetFx45RedistPackageDirectory" Value="redist\" Overridable="yes" />
89
79
- <PackageGroup Id="NetFx45Redist">
90
+ <PackageGroup Id="$(var.NetFx45RedistId)">
91
<ExePackage
92
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html""
93
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html""
@@ -84,7 +95,7 @@
95
PerMachine="yes"
96
DetectCondition="!(wix.NetFx45RedistDetectCondition)"
97
InstallCondition="!(wix.NetFx45RedistInstallCondition)"
87
- Id="NetFx45Redist"
98
+ Id="$(var.NetFx45RedistId)"
99
Vital="yes"
100
Permanent="yes"
101
Protocol="netfx4"
@@ -104,6 +115,12 @@
115
</PackageGroup>
116
</Fragment>
117
118
+ <Fragment>
119
+ <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq" />
120
+
121
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" />
122
+ </Fragment>
123
+
124
<!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) -->
125
<Fragment>
126
<Property Id="NETFRAMEWORK45" Secure="yes">
src/wixlib/NetFx4.wxs
+40
-10
@@ -2,7 +2,9 @@
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
4
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
7
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
8
9
<!--
10
.NET Framework installation state properties
@@ -16,6 +18,11 @@
18
<?define NetFx40RedistLink = http://go.microsoft.com/fwlink/?LinkId=247729 ?>
19
<?define NetFx40ClientWebLink = http://go.microsoft.com/fwlink/?linkid=182804 ?>
20
<?define NetFx40ClientRedistLink = http://go.microsoft.com/fwlink/?LinkId=247730 ?>
21
+ <?define NetFx40EulaLink = http://go.microsoft.com/fwlink/?LinkID=188993 ?>
22
+ <?define NetFx40WebId = NetFx40Web ?>
23
+ <?define NetFx40RedistId = NetFx40Redist ?>
24
+ <?define NetFx40ClientWebId = NetFx40ClientWeb ?>
25
+ <?define NetFx40ClientRedistId = NetFx40ClientRedist ?>
26
27
<Fragment>
28
<PropertyRef Id="NETFRAMEWORK40FULL" />
@@ -38,14 +45,14 @@
45
<Fragment>
46
<util:RegistrySearchRef Id="NETFRAMEWORK40"/>
47
41
- <PackageGroup Id="NetFx40Web">
48
+ <PackageGroup Id="$(var.NetFx40WebId)">
49
<ExePackage
50
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
51
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
52
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
53
PerMachine="yes"
54
DetectCondition="NETFRAMEWORK40"
48
- Id="NetFx40Web"
55
+ Id="$(var.NetFx40WebId)"
56
Vital="yes"
57
Permanent="yes"
58
Protocol="netfx4"
@@ -64,17 +71,23 @@
71
</PackageGroup>
72
</Fragment>
73
74
+ <Fragment>
75
+ <PackageGroup Id="$(var.NetFx40WebId)AsPrereq" />
76
+
77
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
78
+ </Fragment>
79
+
80
<Fragment>
81
<util:RegistrySearchRef Id="NETFRAMEWORK40"/>
82
70
- <PackageGroup Id="NetFx40Redist">
83
+ <PackageGroup Id="$(var.NetFx40RedistId)">
84
<ExePackage
85
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
86
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
87
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
88
PerMachine="yes"
89
DetectCondition="NETFRAMEWORK40"
77
- Id="NetFx40Redist"
90
+ Id="$(var.NetFx40RedistId)"
91
Vital="yes"
92
Permanent="yes"
93
Protocol="netfx4"
@@ -93,6 +106,12 @@
106
</PackageGroup>
107
</Fragment>
108
109
+ <Fragment>
110
+ <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq" />
111
+
112
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
113
+ </Fragment>
114
+
115
<Fragment>
116
<util:RegistrySearch
117
Id="NETFRAMEWORK40CLIENT"
@@ -103,18 +122,17 @@
122
Result="value" />
123
</Fragment>
124
106
-
125
<Fragment>
126
<util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
127
110
- <PackageGroup Id="NetFx40ClientWeb">
128
+ <PackageGroup Id="$(var.NetFx40ClientWebId)">
129
<ExePackage
130
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
131
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
132
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
133
PerMachine="yes"
134
DetectCondition="NETFRAMEWORK40CLIENT"
117
- Id="NetFx40ClientWeb"
135
+ Id="$(var.NetFx40ClientWebId)"
136
Vital="yes"
137
Permanent="yes"
138
Protocol="netfx4"
@@ -133,17 +151,23 @@
151
</PackageGroup>
152
</Fragment>
153
154
+ <Fragment>
155
+ <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq" />
156
+
157
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
158
+ </Fragment>
159
+
160
<Fragment>
161
<util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
162
139
- <PackageGroup Id="NetFx40ClientRedist">
163
+ <PackageGroup Id="$(var.NetFx40ClientRedistId)">
164
<ExePackage
165
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
166
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
167
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
168
PerMachine="yes"
169
DetectCondition="NETFRAMEWORK40CLIENT"
146
- Id="NetFx40ClientRedist"
170
+ Id="$(var.NetFx40ClientRedistId)"
171
Vital="yes"
172
Permanent="yes"
173
Protocol="netfx4"
@@ -162,6 +186,12 @@
186
</PackageGroup>
187
</Fragment>
188
189
+ <Fragment>
190
+ <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq" />
191
+
192
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
193
+ </Fragment>
194
+
195
<!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) -->
196
<Fragment>
197
<Property Id="NETFRAMEWORK40CLIENT" Secure="yes">
src/wixlib/NetFx451.wxs
+22
-5
@@ -2,7 +2,9 @@
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
4
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
7
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
8
9
<!--
10
.NET Framework installation state properties
@@ -15,6 +17,9 @@
17
<?define NetFx451MinRelease = 378675 ?>
18
<?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
19
<?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
20
+ <?define NetFx451EulaLink = http://wixtoolset.org/licenses/netfx451 ?>
21
+ <?define NetFx451WebId = NetFx451Web ?>
22
+ <?define NetFx451RedistId = NetFx451Redist ?>
23
24
<Fragment>
25
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -31,7 +36,7 @@
36
<WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
37
<WixVariable Id="NetFx451WebPackageDirectory" Value="redist\" Overridable="yes" />
38
34
- <PackageGroup Id="NetFx451Web">
39
+ <PackageGroup Id="$(var.NetFx451WebId)">
40
<ExePackage
41
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html""
42
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html""
@@ -39,7 +44,7 @@
44
PerMachine="yes"
45
DetectCondition="!(wix.NetFx451WebDetectCondition)"
46
InstallCondition="!(wix.NetFx451WebInstallCondition)"
42
- Id="NetFx451Web"
47
+ Id="$(var.NetFx451WebId)"
48
Vital="yes"
49
Permanent="yes"
50
Protocol="netfx4"
@@ -59,6 +64,12 @@
64
</PackageGroup>
65
</Fragment>
66
67
+ <Fragment>
68
+ <PackageGroup Id="$(var.NetFx451WebId)AsPrereq" />
69
+
70
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" />
71
+ </Fragment>
72
+
73
<Fragment>
74
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
75
@@ -66,7 +77,7 @@
77
<WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
78
<WixVariable Id="NetFx451RedistPackageDirectory" Value="redist\" Overridable="yes" />
79
69
- <PackageGroup Id="NetFx451Redist">
80
+ <PackageGroup Id="$(var.NetFx451RedistId)">
81
<ExePackage
82
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html""
83
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html""
@@ -74,7 +85,7 @@
85
PerMachine="yes"
86
DetectCondition="!(wix.NetFx451RedistDetectCondition)"
87
InstallCondition="!(wix.NetFx451RedistInstallCondition)"
77
- Id="NetFx451Redist"
88
+ Id="$(var.NetFx451RedistId)"
89
Vital="yes"
90
Permanent="yes"
91
Protocol="netfx4"
@@ -93,4 +104,10 @@
104
</ExePackage>
105
</PackageGroup>
106
</Fragment>
107
+
108
+ <Fragment>
109
+ <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq" />
110
+
111
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" />
112
+ </Fragment>
113
</Wix>
src/wixlib/NetFx452.wxs
+22
-6
@@ -1,8 +1,9 @@
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. -->
3
4
-
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
8
<!--
9
.NET Framework installation state properties
@@ -15,6 +16,9 @@
16
<?define NetFx452MinRelease = 379893 ?>
17
<?define NetFx452WebLink = http://go.microsoft.com/fwlink/?LinkId=397707 ?>
18
<?define NetFx452RedistLink = http://go.microsoft.com/fwlink/?LinkId=397708 ?>
19
+ <?define NetFx452EulaLink = http://wixtoolset.org/licenses/netfx452 ?>
20
+ <?define NetFx452WebId = NetFx452Web ?>
21
+ <?define NetFx452RedistId = NetFx452Redist ?>
22
23
<Fragment>
24
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -31,7 +35,7 @@
35
<WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
36
<WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
37
34
- <PackageGroup Id="NetFx452Web">
38
+ <PackageGroup Id="$(var.NetFx452WebId)">
39
<ExePackage
40
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html""
41
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html""
@@ -39,7 +43,7 @@
43
PerMachine="yes"
44
DetectCondition="!(wix.NetFx452WebDetectCondition)"
45
InstallCondition="!(wix.NetFx452WebInstallCondition)"
42
- Id="NetFx452Web"
46
+ Id="$(var.NetFx452WebId)"
47
Vital="yes"
48
Permanent="yes"
49
Protocol="netfx4"
@@ -58,6 +62,12 @@
62
</PackageGroup>
63
</Fragment>
64
65
+ <Fragment>
66
+ <PackageGroup Id="$(var.NetFx452WebId)AsPrereq" />
67
+
68
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
69
+ </Fragment>
70
+
71
<Fragment>
72
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
73
@@ -65,7 +75,7 @@
75
<WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
76
<WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
77
68
- <PackageGroup Id="NetFx452Redist">
78
+ <PackageGroup Id="$(var.NetFx452RedistId)">
79
<ExePackage
80
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html""
81
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html""
@@ -73,7 +83,7 @@
83
PerMachine="yes"
84
DetectCondition="!(wix.NetFx452RedistDetectCondition)"
85
InstallCondition="!(wix.NetFx452RedistInstallCondition)"
76
- Id="NetFx452Redist"
86
+ Id="$(var.NetFx452RedistId)"
87
Vital="yes"
88
Permanent="yes"
89
Protocol="netfx4"
@@ -92,4 +102,10 @@
102
</ExePackage>
103
</PackageGroup>
104
</Fragment>
105
+
106
+ <Fragment>
107
+ <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq" />
108
+
109
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
110
+ </Fragment>
111
</Wix>
src/wixlib/NetFx46.wxs
+22
-5
@@ -2,7 +2,9 @@
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
4
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
5
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
7
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
8
9
<!--
10
.NET Framework installation state properties
@@ -15,6 +17,9 @@
17
<?define NetFx46MinRelease = 393295 ?>
18
<?define NetFx46WebLink = http://go.microsoft.com/fwlink/?LinkId=560371 ?>
19
<?define NetFx46RedistLink = http://go.microsoft.com/fwlink/?LinkId=560369 ?>
20
+ <?define NetFx46EulaLink = http://go.microsoft.com/fwlink/?LinkID=558772 ?>
21
+ <?define NetFx46WebId = NetFx46Web ?>
22
+ <?define NetFx46RedistId = NetFx46Redist ?>
23
24
<Fragment>
25
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -31,7 +36,7 @@
36
<WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" />
37
<WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" />
38
34
- <PackageGroup Id="NetFx46Web">
39
+ <PackageGroup Id="$(var.NetFx46WebId)">
40
<ExePackage
41
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
42
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
@@ -39,7 +44,7 @@
44
PerMachine="yes"
45
DetectCondition="!(wix.NetFx46WebDetectCondition)"
46
InstallCondition="!(wix.NetFx46WebInstallCondition)"
42
- Id="NetFx46Web"
47
+ Id="$(var.NetFx46WebId)"
48
Vital="yes"
49
Permanent="yes"
50
Protocol="netfx4"
@@ -59,6 +64,12 @@
64
</PackageGroup>
65
</Fragment>
66
67
+ <Fragment>
68
+ <PackageGroup Id="$(var.NetFx46WebId)AsPrereq" />
69
+
70
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" />
71
+ </Fragment>
72
+
73
<Fragment>
74
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
75
@@ -66,7 +77,7 @@
77
<WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" />
78
<WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" />
79
69
- <PackageGroup Id="NetFx46Redist">
80
+ <PackageGroup Id="$(var.NetFx46RedistId)">
81
<ExePackage
82
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
83
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
@@ -74,7 +85,7 @@
85
PerMachine="yes"
86
DetectCondition="!(wix.NetFx46RedistDetectCondition)"
87
InstallCondition="!(wix.NetFx46RedistInstallCondition)"
77
- Id="NetFx46Redist"
88
+ Id="$(var.NetFx46RedistId)"
89
Vital="yes"
90
Permanent="yes"
91
Protocol="netfx4"
@@ -93,4 +104,10 @@
104
</ExePackage>
105
</PackageGroup>
106
</Fragment>
107
+
108
+ <Fragment>
109
+ <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq" />
110
+
111
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" />
112
+ </Fragment>
113
</Wix>
src/wixlib/NetFx461.wxs
+22
-5
@@ -1,7 +1,9 @@
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. -->
3
4
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
8
<!--
9
.NET Framework installation state properties
@@ -14,6 +16,9 @@
16
<?define NetFx461MinRelease = 394254 ?>
17
<?define NetFx461WebLink = http://go.microsoft.com/fwlink/?LinkId=671728 ?>
18
<?define NetFx461RedistLink = http://go.microsoft.com/fwlink/?LinkId=671743 ?>
19
+ <?define NetFx461EulaLink = http://referencesource.microsoft.com/license.html ?>
20
+ <?define NetFx461WebId = NetFx461Web ?>
21
+ <?define NetFx461RedistId = NetFx461Redist ?>
22
23
<Fragment>
24
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -30,7 +35,7 @@
35
<WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" />
36
<WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
37
33
- <PackageGroup Id="NetFx461Web">
38
+ <PackageGroup Id="$(var.NetFx461WebId)">
39
<ExePackage
40
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
41
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
@@ -38,7 +43,7 @@
43
PerMachine="yes"
44
DetectCondition="!(wix.NetFx461WebDetectCondition)"
45
InstallCondition="!(wix.NetFx461WebInstallCondition)"
41
- Id="NetFx461Web"
46
+ Id="$(var.NetFx461WebId)"
47
Vital="yes"
48
Permanent="yes"
49
Protocol="netfx4"
@@ -58,6 +63,12 @@
63
</PackageGroup>
64
</Fragment>
65
66
+ <Fragment>
67
+ <PackageGroup Id="$(var.NetFx461WebId)AsPrereq" />
68
+
69
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" />
70
+ </Fragment>
71
+
72
<Fragment>
73
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
74
@@ -65,7 +76,7 @@
76
<WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />
77
<WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
78
68
- <PackageGroup Id="NetFx461Redist">
79
+ <PackageGroup Id="$(var.NetFx461RedistId)">
80
<ExePackage
81
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
82
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
@@ -73,7 +84,7 @@
84
PerMachine="yes"
85
DetectCondition="!(wix.NetFx461RedistDetectCondition)"
86
InstallCondition="!(wix.NetFx461RedistInstallCondition)"
76
- Id="NetFx461Redist"
87
+ Id="$(var.NetFx461RedistId)"
88
Vital="yes"
89
Permanent="yes"
90
Protocol="netfx4"
@@ -92,4 +103,10 @@
103
</ExePackage>
104
</PackageGroup>
105
</Fragment>
106
+
107
+ <Fragment>
108
+ <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq" />
109
+
110
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" />
111
+ </Fragment>
112
</Wix>
src/wixlib/NetFx462.wxs
+22
-5
@@ -1,7 +1,9 @@
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. -->
3
4
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
8
<!--
9
.NET Framework installation state properties
@@ -14,6 +16,9 @@
16
<?define NetFx462MinRelease = 394802 ?>
17
<?define NetFx462WebLink = http://go.microsoft.com/fwlink/?LinkId=780596 ?>
18
<?define NetFx462RedistLink = http://go.microsoft.com/fwlink/?LinkId=780600 ?>
19
+ <?define NetFx462EulaLink = http://referencesource.microsoft.com/license.html ?>
20
+ <?define NetFx462WebId = NetFx462Web ?>
21
+ <?define NetFx462RedistId = NetFx462Redist ?>
22
23
<Fragment>
24
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -30,7 +35,7 @@
35
<WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" />
36
<WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
37
33
- <PackageGroup Id="NetFx462Web">
38
+ <PackageGroup Id="$(var.NetFx462WebId)">
39
<ExePackage
40
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
41
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
@@ -38,7 +43,7 @@
43
PerMachine="yes"
44
DetectCondition="!(wix.NetFx462WebDetectCondition)"
45
InstallCondition="!(wix.NetFx462WebInstallCondition)"
41
- Id="NetFx462Web"
46
+ Id="$(var.NetFx462WebId)"
47
Vital="yes"
48
Permanent="yes"
49
Protocol="netfx4"
@@ -58,6 +63,12 @@
63
</PackageGroup>
64
</Fragment>
65
66
+ <Fragment>
67
+ <PackageGroup Id="$(var.NetFx462WebId)AsPrereq" />
68
+
69
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
70
+ </Fragment>
71
+
72
<Fragment>
73
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
74
@@ -65,7 +76,7 @@
76
<WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" />
77
<WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" />
78
68
- <PackageGroup Id="NetFx462Redist">
79
+ <PackageGroup Id="$(var.NetFx462RedistId)">
80
<ExePackage
81
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
82
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
@@ -73,7 +84,7 @@
84
PerMachine="yes"
85
DetectCondition="!(wix.NetFx462RedistDetectCondition)"
86
InstallCondition="!(wix.NetFx462RedistInstallCondition)"
76
- Id="NetFx462Redist"
87
+ Id="$(var.NetFx462RedistId)"
88
Vital="yes"
89
Permanent="yes"
90
Protocol="netfx4"
@@ -92,4 +103,10 @@
103
</ExePackage>
104
</PackageGroup>
105
</Fragment>
106
+
107
+ <Fragment>
108
+ <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq" />
109
+
110
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
111
+ </Fragment>
112
</Wix>
src/wixlib/netfx.wixproj
+2
@@ -46,8 +46,10 @@
46
</PropertyGroup>
47
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
48
<Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
49
+ <Error Condition="!Exists('..\..\packages\WixToolset.Bal.wixext.4.0.29\build\WixToolset.Bal.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Bal.wixext.4.0.29\build\WixToolset.Bal.wixext.targets'))" />
50
<Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.30\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.30\build\WixToolset.Util.wixext.targets'))" />
51
</Target>
52
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
53
+ <Import Project="..\..\packages\WixToolset.Bal.wixext.4.0.29\build\WixToolset.Bal.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Bal.wixext.4.0.29\build\WixToolset.Bal.wixext.targets')" />
54
<Import Project="..\..\packages\WixToolset.Util.wixext.4.0.30\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.30\build\WixToolset.Util.wixext.targets')" />
55
</Project>
\ No newline at end of file
src/wixlib/packages.config
+1
@@ -2,5 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
<package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
5
+ <package id="WixToolset.Bal.wixext" version="4.0.29" targetFramework="net40" />
6
<package id="WixToolset.Util.wixext" version="4.0.30" targetFramework="net40" />
7
</packages>
\ No newline at end of file