Skip to content

Commit a68b2fc

Browse files
authored
Merge pull request Azure#4895 from sphibbs/sphibbs/msi
ISVSINSTLL dep check to skip .net 4.5.2 when VS calls us
2 parents 5ea822f + bd8e837 commit a68b2fc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

setup/azurecmd.wxs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<Icon Id="icon.ico" SourceFile="media\WAIcon.ico"/>
2525
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
2626
<Property Id="ALLUSERS" Value="1" />
27+
<Property Id="ISVSINSTALL" Secure="yes"/>
2728
<!-- per machine install-->
2829
<Property Id="PSCOMPATIBLEVERSION">
2930
<RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
@@ -51,7 +52,7 @@
5152
<Condition Message="This setup requires the .NET Framework 4.5.2 or higher to be installed.">
5253
<!-- NETFRAMEWORK45 contains a DWORD with installed version key to versions is here: -->
5354
<!-- https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#detect_net -->
54-
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893")]]>
55+
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893") or ISVSINSTALL]]>
5556
</Condition>
5657

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

0 commit comments

Comments
 (0)