1 files changed, 22 insertions, 5 deletions

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 &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
           RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
@@ -38,7 +43,7 @@
           PerMachine="yes"
           DetectCondition="!(wix.NetFx462WebDetectCondition)"
           InstallCondition="!(wix.NetFx462WebInstallCondition)"
-          Id="NetFx462Web"
+          Id="$(var.NetFx462WebId)"
           Vital="yes"
           Permanent="yes"
           Protocol="netfx4"
@@ -59,13 +64,19 @@
   </Fragment>
 
   <Fragment>
+    <PackageGroup Id="$(var.NetFx462WebId)AsPrereq" />
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+  </Fragment>
+
+  <Fragment>
     <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
     <WixVariable Id="NetFx462RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
     <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 &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
           RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
@@ -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>