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