Skip to content

ISVSINSTLL dep check to skip .net 4.5.2 when VS calls us #4895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2017
Merged

ISVSINSTLL dep check to skip .net 4.5.2 when VS calls us #4895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion setup/azurecmd.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<Icon Id="icon.ico" SourceFile="media\WAIcon.ico"/>
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
<Property Id="ALLUSERS" Value="1" />
<Property Id="ISVSINSTALL" Secure="yes"/>
<!-- per machine install-->
<Property Id="PSCOMPATIBLEVERSION">
<RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
Expand Down Expand Up @@ -51,7 +52,7 @@
<Condition Message="This setup requires the .NET Framework 4.5.2 or higher to be installed.">
<!-- NETFRAMEWORK45 contains a DWORD with installed version key to versions is here: -->
<!-- https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#detect_net -->
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893")]]>
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893") or ISVSINSTALL]]>
</Condition>

<Directory Id="TARGETDIR" Name="SourceDir">
Expand Down