Add support for .NET Framework 4.7.2 and .NET Framework 4.8 to NetFxExtension. Based on https://github.com/wixtoolset/wix4/pull/267

1 files changed, 98 insertions, 0 deletions

diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
new file mode 100644
index 00000000..5156c3f0
--- /dev/null
+++ b/src/wixlib/NetFx48.wxs
@@ -0,0 +1,98 @@
+<?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">
+
+    <!--
+      .NET Framework installation state properties
+      Official documentation can be found at the following location:
+      .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7/4.7.1/4.7.2/4.8 - https://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+   -->
+
+    <?define NetFx48MinRelease = 528040 ?>
+    <?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 ?>
+
+    <Fragment>
+        <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+        <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" />
+        <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch">
+            WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)"
+        </SetProperty>
+    </Fragment>
+
+    <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">
+            <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;"
+                PerMachine="yes"
+                DetectCondition="!(wix.NetFx48WebDetectCondition)"
+                InstallCondition="!(wix.NetFx48WebInstallCondition)"
+                Id="NetFx48Web"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="netfx4"
+                DownloadUrl="$(var.NetFx48WebLink)"
+                LogPathVariable="NetFx48FullLog"
+                Compressed="no"
+                Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
+                <RemotePayload
+                  CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE"
+                  CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675"
+                  Description="Microsoft .NET Framework 4.8 Setup"
+                  Hash="755349ECD6A478FE010E466B29911D2388F6CE94"
+                  ProductName="Microsoft .NET Framework 4.8"
+                  Size="1486376"
+                  Version="4.8.3761.0" />
+            </ExePackage>
+        </PackageGroup>
+    </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">
+            <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;"
+                PerMachine="yes"
+                DetectCondition="!(wix.NetFx48RedistDetectCondition)"
+                InstallCondition="!(wix.NetFx48RedistInstallCondition)"
+                Id="NetFx48Redist"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="netfx4"
+                DownloadUrl="$(var.NetFx48RedistLink)"
+                LogPathVariable="NetFx48FullLog"
+                Compressed="no"
+                Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
+                <RemotePayload
+                  CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE"
+                  CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675"
+                  Description="Microsoft .NET Framework 4.8 Setup"
+                  Hash="0D425249D42A01E7AB3AC243152FA7773C43F0BF"
+                  ProductName="Microsoft .NET Framework 4.8"
+                  Size="72721568"
+                  Version="4.8.3761.0" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>