From f2e8523f44eeb88e418c93f00715896d663dc256 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 23 Apr 2020 12:28:56 +1000
Subject: Move MBA prereq info back into NetFx.
---
nuget.config | 1 +
src/wixlib/NetFx4.5.wxs | 27 ++++++++++++++++++++-----
src/wixlib/NetFx4.wxs | 50 ++++++++++++++++++++++++++++++++++++----------
src/wixlib/NetFx451.wxs | 27 ++++++++++++++++++++-----
src/wixlib/NetFx452.wxs | 28 ++++++++++++++++++++------
src/wixlib/NetFx46.wxs | 27 ++++++++++++++++++++-----
src/wixlib/NetFx461.wxs | 27 ++++++++++++++++++++-----
src/wixlib/NetFx462.wxs | 27 ++++++++++++++++++++-----
src/wixlib/netfx.wixproj | 2 ++
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 @@
<add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
<add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" />
<add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" />
+ <add key="wixtoolset-bal-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-bal-wixext" />
<add key="wixtoolset-util-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-util-wixext" />
<add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
<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 @@
<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -15,6 +17,9 @@
<?define NetFx45MinRelease = 378389?>
<?define NetFx45WebLink = http://go.microsoft.com/fwlink/?LinkId=225704 ?>
<?define NetFx45RedistLink = http://go.microsoft.com/fwlink/?LinkId=225702 ?>
+ <?define NetFx45EulaLink = http://go.microsoft.com/fwlink/?LinkID=260867 ?>
+ <?define NetFx45WebId = NetFx45Web ?>
+ <?define NetFx45RedistId = NetFx45Redist ?>
<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -41,7 +46,7 @@
<WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx45WebPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx45Web">
+ <PackageGroup Id="$(var.NetFx45WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullWebLog].html""
@@ -49,7 +54,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx45WebDetectCondition)"
InstallCondition="!(wix.NetFx45WebInstallCondition)"
- Id="NetFx45Web"
+ Id="$(var.NetFx45WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -69,6 +74,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx45WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
@@ -76,7 +87,7 @@
<WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx45RedistPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx45Redist">
+ <PackageGroup Id="$(var.NetFx45RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx45FullLog].html""
@@ -84,7 +95,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx45RedistDetectCondition)"
InstallCondition="!(wix.NetFx45RedistInstallCondition)"
- Id="NetFx45Redist"
+ Id="$(var.NetFx45RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -104,6 +115,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" />
+ </Fragment>
+
<!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) -->
<Fragment>
<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 @@
<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -16,6 +18,11 @@
<?define NetFx40RedistLink = http://go.microsoft.com/fwlink/?LinkId=247729 ?>
<?define NetFx40ClientWebLink = http://go.microsoft.com/fwlink/?linkid=182804 ?>
<?define NetFx40ClientRedistLink = http://go.microsoft.com/fwlink/?LinkId=247730 ?>
+ <?define NetFx40EulaLink = http://go.microsoft.com/fwlink/?LinkID=188993 ?>
+ <?define NetFx40WebId = NetFx40Web ?>
+ <?define NetFx40RedistId = NetFx40Redist ?>
+ <?define NetFx40ClientWebId = NetFx40ClientWeb ?>
+ <?define NetFx40ClientRedistId = NetFx40ClientRedist ?>
<Fragment>
<PropertyRef Id="NETFRAMEWORK40FULL" />
@@ -38,14 +45,14 @@
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK40"/>
- <PackageGroup Id="NetFx40Web">
+ <PackageGroup Id="$(var.NetFx40WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
PerMachine="yes"
DetectCondition="NETFRAMEWORK40"
- Id="NetFx40Web"
+ Id="$(var.NetFx40WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -64,17 +71,23 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx40WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK40"/>
- <PackageGroup Id="NetFx40Redist">
+ <PackageGroup Id="$(var.NetFx40RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
PerMachine="yes"
DetectCondition="NETFRAMEWORK40"
- Id="NetFx40Redist"
+ Id="$(var.NetFx40RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -93,6 +106,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearch
Id="NETFRAMEWORK40CLIENT"
@@ -103,18 +122,17 @@
Result="value" />
</Fragment>
-
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
- <PackageGroup Id="NetFx40ClientWeb">
+ <PackageGroup Id="$(var.NetFx40ClientWebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
PerMachine="yes"
DetectCondition="NETFRAMEWORK40CLIENT"
- Id="NetFx40ClientWeb"
+ Id="$(var.NetFx40ClientWebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -133,17 +151,23 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
- <PackageGroup Id="NetFx40ClientRedist">
+ <PackageGroup Id="$(var.NetFx40ClientRedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]""
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]""
PerMachine="yes"
DetectCondition="NETFRAMEWORK40CLIENT"
- Id="NetFx40ClientRedist"
+ Id="$(var.NetFx40ClientRedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -162,6 +186,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
+ </Fragment>
+
<!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) -->
<Fragment>
<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 @@
<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -15,6 +17,9 @@
<?define NetFx451MinRelease = 378675 ?>
<?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
<?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
+ <?define NetFx451EulaLink = http://wixtoolset.org/licenses/netfx451 ?>
+ <?define NetFx451WebId = NetFx451Web ?>
+ <?define NetFx451RedistId = NetFx451Redist ?>
<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -31,7 +36,7 @@
<WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx451WebPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx451Web">
+ <PackageGroup Id="$(var.NetFx451WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html""
@@ -39,7 +44,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx451WebDetectCondition)"
InstallCondition="!(wix.NetFx451WebInstallCondition)"
- Id="NetFx451Web"
+ Id="$(var.NetFx451WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -59,6 +64,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx451WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
@@ -66,7 +77,7 @@
<WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx451RedistPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx451Redist">
+ <PackageGroup Id="$(var.NetFx451RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html""
@@ -74,7 +85,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx451RedistDetectCondition)"
InstallCondition="!(wix.NetFx451RedistInstallCondition)"
- Id="NetFx451Redist"
+ Id="$(var.NetFx451RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -93,4 +104,10 @@
</ExePackage>
</PackageGroup>
</Fragment>
+
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" />
+ </Fragment>
</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 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -15,6 +16,9 @@
<?define NetFx452MinRelease = 379893 ?>
<?define NetFx452WebLink = http://go.microsoft.com/fwlink/?LinkId=397707 ?>
<?define NetFx452RedistLink = http://go.microsoft.com/fwlink/?LinkId=397708 ?>
+ <?define NetFx452EulaLink = http://wixtoolset.org/licenses/netfx452 ?>
+ <?define NetFx452WebId = NetFx452Web ?>
+ <?define NetFx452RedistId = NetFx452Redist ?>
<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -31,7 +35,7 @@
<WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx452Web">
+ <PackageGroup Id="$(var.NetFx452WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullWebLog].html""
@@ -39,7 +43,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx452WebDetectCondition)"
InstallCondition="!(wix.NetFx452WebInstallCondition)"
- Id="NetFx452Web"
+ Id="$(var.NetFx452WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -58,6 +62,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx452WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
@@ -65,7 +75,7 @@
<WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx452Redist">
+ <PackageGroup Id="$(var.NetFx452RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx452FullLog].html""
@@ -73,7 +83,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx452RedistDetectCondition)"
InstallCondition="!(wix.NetFx452RedistInstallCondition)"
- Id="NetFx452Redist"
+ Id="$(var.NetFx452RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -92,4 +102,10 @@
</ExePackage>
</PackageGroup>
</Fragment>
+
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
+ </Fragment>
</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 @@
<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -15,6 +17,9 @@
<?define NetFx46MinRelease = 393295 ?>
<?define NetFx46WebLink = http://go.microsoft.com/fwlink/?LinkId=560371 ?>
<?define NetFx46RedistLink = http://go.microsoft.com/fwlink/?LinkId=560369 ?>
+ <?define NetFx46EulaLink = http://go.microsoft.com/fwlink/?LinkID=558772 ?>
+ <?define NetFx46WebId = NetFx46Web ?>
+ <?define NetFx46RedistId = NetFx46Redist ?>
<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -31,7 +36,7 @@
<WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx46Web">
+ <PackageGroup Id="$(var.NetFx46WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
@@ -39,7 +44,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx46WebDetectCondition)"
InstallCondition="!(wix.NetFx46WebInstallCondition)"
- Id="NetFx46Web"
+ Id="$(var.NetFx46WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -59,6 +64,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx46WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
@@ -66,7 +77,7 @@
<WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx46Redist">
+ <PackageGroup Id="$(var.NetFx46RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx46FullLog].html""
@@ -74,7 +85,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx46RedistDetectCondition)"
InstallCondition="!(wix.NetFx46RedistInstallCondition)"
- Id="NetFx46Redist"
+ Id="$(var.NetFx46RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -93,4 +104,10 @@
</ExePackage>
</PackageGroup>
</Fragment>
+
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" />
+ </Fragment>
</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 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -14,6 +16,9 @@
<?define NetFx461MinRelease = 394254 ?>
<?define NetFx461WebLink = http://go.microsoft.com/fwlink/?LinkId=671728 ?>
<?define NetFx461RedistLink = http://go.microsoft.com/fwlink/?LinkId=671743 ?>
+ <?define NetFx461EulaLink = http://referencesource.microsoft.com/license.html ?>
+ <?define NetFx461WebId = NetFx461Web ?>
+ <?define NetFx461RedistId = NetFx461Redist ?>
<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -30,7 +35,7 @@
<WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx461Web">
+ <PackageGroup Id="$(var.NetFx461WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
@@ -38,7 +43,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx461WebDetectCondition)"
InstallCondition="!(wix.NetFx461WebInstallCondition)"
- Id="NetFx461Web"
+ Id="$(var.NetFx461WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -58,6 +63,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx461WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
@@ -65,7 +76,7 @@
<WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx461Redist">
+ <PackageGroup Id="$(var.NetFx461RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx461FullLog].html""
@@ -73,7 +84,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx461RedistDetectCondition)"
InstallCondition="!(wix.NetFx461RedistInstallCondition)"
- Id="NetFx461Redist"
+ Id="$(var.NetFx461RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -92,4 +103,10 @@
</ExePackage>
</PackageGroup>
</Fragment>
+
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" />
+ </Fragment>
</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 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!--
.NET Framework installation state properties
@@ -14,6 +16,9 @@
<?define NetFx462MinRelease = 394802 ?>
<?define NetFx462WebLink = http://go.microsoft.com/fwlink/?LinkId=780596 ?>
<?define NetFx462RedistLink = http://go.microsoft.com/fwlink/?LinkId=780600 ?>
+ <?define NetFx462EulaLink = http://referencesource.microsoft.com/license.html ?>
+ <?define NetFx462WebId = NetFx462Web ?>
+ <?define NetFx462RedistId = NetFx462Redist ?>
<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -30,7 +35,7 @@
<WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx462Web">
+ <PackageGroup Id="$(var.NetFx462WebId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
@@ -38,7 +43,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx462WebDetectCondition)"
InstallCondition="!(wix.NetFx462WebInstallCondition)"
- Id="NetFx462Web"
+ Id="$(var.NetFx462WebId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -58,6 +63,12 @@
</PackageGroup>
</Fragment>
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx462WebId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+ </Fragment>
+
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
@@ -65,7 +76,7 @@
<WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx462RedistPackageDirectory" Value="redist\" Overridable="yes" />
- <PackageGroup Id="NetFx462Redist">
+ <PackageGroup Id="$(var.NetFx462RedistId)">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html""
@@ -73,7 +84,7 @@
PerMachine="yes"
DetectCondition="!(wix.NetFx462RedistDetectCondition)"
InstallCondition="!(wix.NetFx462RedistInstallCondition)"
- Id="NetFx462Redist"
+ Id="$(var.NetFx462RedistId)"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
@@ -92,4 +103,10 @@
</ExePackage>
</PackageGroup>
</Fragment>
+
+ <Fragment>
+ <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq" />
+
+ <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+ </Fragment>
</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 @@
</PropertyGroup>
<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'))" />
<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'))" />
+ <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'))" />
<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'))" />
</Target>
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+ <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')" />
<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')" />
</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 @@
<packages>
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
<package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
+ <package id="WixToolset.Bal.wixext" version="4.0.29" targetFramework="net40" />
<package id="WixToolset.Util.wixext" version="4.0.30" targetFramework="net40" />
</packages>
\ No newline at end of file
--
cgit v1.2.3-55-g6feb