Skip to content

Commit df30a44

Browse files
authored
Merge pull request Azure#3909 from markcowl/net452ins
Updating installer to require .Net 4.5.2
2 parents 6609746 + 27dcb62 commit df30a44

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

setup/azurecmd.wxs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
33

44
<?define productName="Microsoft Azure PowerShell - May 2017" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
@@ -47,10 +47,11 @@
4747
<![CDATA[Installed or (PSCOMPATIBLEVERSION >< "3.0")]]>
4848
</Condition>
4949

50-
<PropertyRef Id="NETFRAMEWORK40FULL" />
51-
<PropertyRef Id="NETFRAMEWORK40CLIENT" />
52-
<Condition Message="This setup requires the .NET Framework 4.0 or higher to be installed.">
53-
Installed OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT
50+
<PropertyRef Id="NETFRAMEWORK45" />
51+
<Condition Message="This setup requires the .NET Framework 4.5.2 or higher to be installed.">
52+
<!-- NETFRAMEWORK45 contains a DWORD with installed version key to versions is here: -->
53+
<!-- https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#detect_net -->
54+
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893")]]>
5455
</Condition>
5556

5657
<Directory Id="TARGETDIR" Name="SourceDir">

0 commit comments

Comments
 (0)