Skip to content

Commit

Permalink
Merge pull request #431 from Azure/master
Browse files Browse the repository at this point in the history
Merging fixes from azure branch
  • Loading branch information
rramachand21 committed May 20, 2015
2 parents 33f224a + b716b93 commit 0bd5137
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/setup/iisnode-msi/iisnode.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<PropertyRef Id="IISMAJORVERSION" />

<Condition Message="IIS 7.x or later must be installed before iisnode installation.">
<![CDATA[IISMAJORVERSION >= "#7"]]>
<![CDATA[ Installed OR ((VersionNT = 600 AND ServicePackLevel >= 1) OR (VersionNT > 600)) ]]>
</Condition>

<Directory Id="TARGETDIR" Name="SourceDir">
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.17
0.2.18

0 comments on commit 0bd5137

Please sign in to comment.