WIXFEAT:5575 Add MSI properties for 4.7 and 4.7.1.
Sean Hall committed
May 22, 2020 at 21:14 UTC
8b709e477823a15c48dff81ac33a17fe88ae7114
3 files changed
+52
src/wixlib/NetFx47.wxs
new
+25
@@ -0,0 +1,25 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<!-- 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. -->
3
+
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
+
8
+ <!--
9
+ .NET Framework installation state properties
10
+
11
+ Official documentation can be found at the following location:
12
+
13
+ .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
14
+ -->
15
+
16
+ <?define NetFx47MinRelease = 460798 ?>
17
+
18
+ <Fragment>
19
+ <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
20
+ <Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
21
+ <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch">
22
+ WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
23
+ </SetProperty>
24
+ </Fragment>
25
+</Wix>
src/wixlib/NetFx471.wxs
new
+25
@@ -0,0 +1,25 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<!-- 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. -->
3
+
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
5
+ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6
+ xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
+
8
+ <!--
9
+ .NET Framework installation state properties
10
+
11
+ Official documentation can be found at the following location:
12
+
13
+ .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
14
+ -->
15
+
16
+ <?define NetFx471MinRelease = 461308 ?>
17
+
18
+ <Fragment>
19
+ <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
20
+ <Property Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Secure="yes" />
21
+ <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch">
22
+ WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx471MinRelease)"
23
+ </SetProperty>
24
+ </Fragment>
25
+</Wix>
src/wixlib/netfx.wixproj
+2
@@ -24,6 +24,8 @@
24
<Compile Include="NetFx46.wxs" />
25
<Compile Include="NetFx461.wxs" />
26
<Compile Include="NetFx462.wxs" />
27
+ <Compile Include="NetFx47.wxs" />
28
+ <Compile Include="NetFx471.wxs" />
29
<Compile Include="NetFx472.wxs" />
30
<Compile Include="NetFx48.wxs" />
31
<Compile Include="NetFxExtension_x86.wxs" />