diff options
Diffstat (limited to 'src/wixlib/NetFx46.wxs')
-rw-r--r-- | src/wixlib/NetFx46.wxs | 27 |
1 files changed, 22 insertions, 5 deletions
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> |