aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx4.5.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx4.5.wxs')
-rw-r--r--src/wixlib/NetFx4.5.wxs27
1 files changed, 22 insertions, 5 deletions
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 &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;" 51 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
47 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;" 52 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
@@ -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 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" /> 86 <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(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 &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;" 92 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
82 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;" 93 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
@@ -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">