aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx461.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx461.wxs')
-rw-r--r--src/wixlib/NetFx461.wxs27
1 files changed, 22 insertions, 5 deletions
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 &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 40 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
36 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 41 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
@@ -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 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" /> 75 <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(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 &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 81 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
71 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 82 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
@@ -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>