From 8b709e477823a15c48dff81ac33a17fe88ae7114 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 22 May 2020 21:14:06 +1000
Subject: WIXFEAT:5575 Add MSI properties for 4.7 and 4.7.1.

---
 src/wixlib/NetFx47.wxs   | 25 +++++++++++++++++++++++++
 src/wixlib/NetFx471.wxs  | 25 +++++++++++++++++++++++++
 src/wixlib/netfx.wixproj |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 src/wixlib/NetFx47.wxs
 create mode 100644 src/wixlib/NetFx471.wxs

diff --git a/src/wixlib/NetFx47.wxs b/src/wixlib/NetFx47.wxs
new file mode 100644
index 00000000..2f4966ad
--- /dev/null
+++ b/src/wixlib/NetFx47.wxs
@@ -0,0 +1,25 @@
+<?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:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+     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 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx47MinRelease = 460798 ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch">
+      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
+    </SetProperty>
+  </Fragment>
+</Wix>
diff --git a/src/wixlib/NetFx471.wxs b/src/wixlib/NetFx471.wxs
new file mode 100644
index 00000000..3fd99aa3
--- /dev/null
+++ b/src/wixlib/NetFx471.wxs
@@ -0,0 +1,25 @@
+<?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:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+     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 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+    -->
+
+  <?define NetFx471MinRelease = 461308 ?>
+
+  <Fragment>
+    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
+    <Property Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Secure="yes" />
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch">
+      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx471MinRelease)"
+    </SetProperty>
+  </Fragment>
+</Wix>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index dff4762a..c153eda9 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -24,6 +24,8 @@
     <Compile Include="NetFx46.wxs" />
     <Compile Include="NetFx461.wxs" />
     <Compile Include="NetFx462.wxs" />
+    <Compile Include="NetFx47.wxs" />
+    <Compile Include="NetFx471.wxs" />
     <Compile Include="NetFx472.wxs" />
     <Compile Include="NetFx48.wxs" />
     <Compile Include="NetFxExtension_x86.wxs" />
-- 
cgit v1.2.3-55-g6feb