From 2f656639071852058f884126f8d75bbf3512d78f Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 20 May 2020 23:04:12 +1000
Subject: Integrate new .NET Framework packages into v4.

---
 src/wixlib/NetFx472.wxs  | 60 +++++++++++++++++++++++++------------------
 src/wixlib/NetFx48.wxs   | 66 ++++++++++++++++++++++++++++--------------------
 src/wixlib/netfx.wixproj |  4 +--
 3 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index 152d2245..08a17d5b 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.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
@@ -11,8 +13,10 @@
 
   <?define NetFx472MinRelease = 461808 ?>
   <?define NetFx472WebLink = https://go.microsoft.com/fwlink/?LinkId=863262 ?>
-  <?define NetFx472RedistLink = https://go.microsoft.com/fwlink/?LinkId=863265 ?>
+  <?define NetFx472RedistLink = https://go.microsoft.com/fwlink/?LinkId=863258 ?>
   <?define NetFx472EulaLink = https://referencesource.microsoft.com/license.html ?>
+  <?define NetFx472WebId = NetFx472Web ?>
+  <?define NetFx472RedistId = NetFx472Redist ?>
 
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -25,74 +29,82 @@
   <Fragment>
     <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
-    <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Web" />
-    <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
     <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
     <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
 
-    <PackageGroup Id="NetFx472Web">
+    <PackageGroup Id="$(var.NetFx472WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
+          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
+          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
+          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx472WebDetectCondition)"
           InstallCondition="!(wix.NetFx472WebInstallCondition)"
-          Id="NetFx472Web"
+          Id="$(var.NetFx472WebId)"
           Vital="yes"
           Permanent="yes"
           Protocol="netfx4"
           DownloadUrl="$(var.NetFx472WebLink)"
-          LogPathVariable="NetFx472FullLog"
+          LogPathVariable="NetFx472WebLog"
           Compressed="no"
           Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
         <RemotePayload
           CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
           CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
           Description="Microsoft .NET Framework 4.7.2 Setup"
-          Hash="507ECDADC23A27C2283BA130A2AA51650E6BC05B"
+          Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB"
           ProductName="Microsoft .NET Framework 4.7.2"
-          Size="1447320"
-          Version="4.7.3062.0" />
+          Size="1432848"
+          Version="4.7.3081.0" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
 
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx472WebId)AsPrereq" />
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
+  </Fragment>
+
   <Fragment>
     <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
-    <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Redist" />
-    <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
     <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
     <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
-    <PackageGroup Id="NetFx472Redist">
+    <PackageGroup Id="$(var.NetFx472RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
+          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
+          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
+          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx472RedistDetectCondition)"
           InstallCondition="!(wix.NetFx472RedistInstallCondition)"
-          Id="NetFx472Redist"
+          Id="$(var.NetFx472RedistId)"
           Vital="yes"
           Permanent="yes"
           Protocol="netfx4"
           DownloadUrl="$(var.NetFx472RedistLink)"
-          LogPathVariable="NetFx472FullLog"
+          LogPathVariable="NetFx472RedistLog"
           Compressed="no"
           Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
         <RemotePayload
           CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
           CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
           Description="Microsoft .NET Framework 4.7.2 Setup"
-          Hash="D3A416DC5FC75758D41B4C0158ACA69270D2A904"
+          Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E"
           ProductName="Microsoft .NET Framework 4.7.2"
-          Size="71607232"
-          Version="4.7.3062.0" />
+          Size="83943272"
+          Version="4.7.3081.0" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
+
+  <Fragment>
+    <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq" />
+
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
+  </Fragment>
 </Wix>
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index 5156c3f0..d65d36be 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.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
@@ -13,6 +15,8 @@
     <?define NetFx48WebLink = https://go.microsoft.com/fwlink/?LinkId=2085155 ?>
     <?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?>
     <?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?>
+    <?define NetFx48WebId = NetFx48Web ?>
+    <?define NetFx48RedistId = NetFx48Redist ?>
 
     <Fragment>
         <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
@@ -25,74 +29,82 @@
     <Fragment>
         <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
-        <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Web" />
-        <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
         <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
         <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
 
-        <PackageGroup Id="NetFx48Web">
+        <PackageGroup Id="$(var.NetFx48WebId)">
             <ExePackage
-                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
-                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
-                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
+                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
+                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
+                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
                 PerMachine="yes"
                 DetectCondition="!(wix.NetFx48WebDetectCondition)"
                 InstallCondition="!(wix.NetFx48WebInstallCondition)"
-                Id="NetFx48Web"
+                Id="$(var.NetFx48WebId)"
                 Vital="yes"
                 Permanent="yes"
                 Protocol="netfx4"
                 DownloadUrl="$(var.NetFx48WebLink)"
-                LogPathVariable="NetFx48FullLog"
+                LogPathVariable="NetFx48WebLog"
                 Compressed="no"
                 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
                 <RemotePayload
-                  CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE"
-                  CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675"
+                  CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22" 
+                  CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12" 
                   Description="Microsoft .NET Framework 4.8 Setup"
-                  Hash="755349ECD6A478FE010E466B29911D2388F6CE94"
+                  Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" 
                   ProductName="Microsoft .NET Framework 4.8"
-                  Size="1486376"
-                  Version="4.8.3761.0" />
+                  Size="1479400" 
+                  Version="4.8.3928.0" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
 
+    <Fragment>
+        <PackageGroup Id="$(var.NetFx48WebId)AsPrereq" />
+
+        <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
+    </Fragment>
+
     <Fragment>
         <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
-        <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Redist" />
-        <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
         <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
         <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
-        <PackageGroup Id="NetFx48Redist">
+        <PackageGroup Id="$(var.NetFx48RedistId)">
             <ExePackage
-                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
-                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
-                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
+                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
+                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
+                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
                 PerMachine="yes"
                 DetectCondition="!(wix.NetFx48RedistDetectCondition)"
                 InstallCondition="!(wix.NetFx48RedistInstallCondition)"
-                Id="NetFx48Redist"
+                Id="$(var.NetFx48RedistId)"
                 Vital="yes"
                 Permanent="yes"
                 Protocol="netfx4"
                 DownloadUrl="$(var.NetFx48RedistLink)"
-                LogPathVariable="NetFx48FullLog"
+                LogPathVariable="NetFx48RedistLog"
                 Compressed="no"
                 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
                 <RemotePayload
-                  CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE"
-                  CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675"
+                  CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22" 
+                  CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12" 
                   Description="Microsoft .NET Framework 4.8 Setup"
-                  Hash="0D425249D42A01E7AB3AC243152FA7773C43F0BF"
+                  Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C" 
                   ProductName="Microsoft .NET Framework 4.8"
-                  Size="72721568"
-                  Version="4.8.3761.0" />
+                  Size="117380440" 
+                  Version="4.8.3928.0" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
+
+    <Fragment>
+        <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq" />
+
+        <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
+    </Fragment>
 </Wix>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 371ee24d..7cbd4a2b 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -11,8 +11,6 @@
     <Pedantic>true</Pedantic>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="NetFx472.wxs" />
-    <Compile Include="NetFx48.wxs" />
     <Compile Include="NetFxExtension.wxs" />
     <Compile Include="NetFx1.wxs" />
     <Compile Include="NetFx1.1.wxs" />
@@ -26,6 +24,8 @@
     <Compile Include="NetFx46.wxs" />
     <Compile Include="NetFx461.wxs" />
     <Compile Include="NetFx462.wxs" />
+    <Compile Include="NetFx472.wxs" />
+    <Compile Include="NetFx48.wxs" />
     <Compile Include="NetFxExtension_x86.wxs" />
     <Compile Include="NetCore3.1.0_x64.wxs" />
     <Compile Include="NetCore3.1.0_x86.wxs" />
-- 
cgit v1.2.3-55-g6feb