aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx452.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx452.wxs')
-rw-r--r--src/wixlib/NetFx452.wxs28
1 files changed, 22 insertions, 6 deletions
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 &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;" 40 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
37 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;" 41 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
@@ -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 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" /> 74 <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(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 &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;" 80 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
71 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;" 81 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
@@ -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>