diff options
-rw-r--r-- | src/wixlib/NetFx47.wxs | 25 | ||||
-rw-r--r-- | src/wixlib/NetFx471.wxs | 25 | ||||
-rw-r--r-- | src/wixlib/netfx.wixproj | 2 |
3 files changed, 52 insertions, 0 deletions
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 @@ | |||
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> | ||
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 @@ | |||
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> | ||
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 @@ | |||
24 | <Compile Include="NetFx46.wxs" /> | 24 | <Compile Include="NetFx46.wxs" /> |
25 | <Compile Include="NetFx461.wxs" /> | 25 | <Compile Include="NetFx461.wxs" /> |
26 | <Compile Include="NetFx462.wxs" /> | 26 | <Compile Include="NetFx462.wxs" /> |
27 | <Compile Include="NetFx47.wxs" /> | ||
28 | <Compile Include="NetFx471.wxs" /> | ||
27 | <Compile Include="NetFx472.wxs" /> | 29 | <Compile Include="NetFx472.wxs" /> |
28 | <Compile Include="NetFx48.wxs" /> | 30 | <Compile Include="NetFx48.wxs" /> |
29 | <Compile Include="NetFxExtension_x86.wxs" /> | 31 | <Compile Include="NetFxExtension_x86.wxs" /> |