Merge pull request #431 from Azure/master

Merging fixes from azure branch
tjanczuk · May 20, 2015 · 0bd5137 · 0bd5137
2 parents 33f224a + b716b93
commit 0bd5137
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/setup/iisnode-msi/iisnode.wxs b/src/setup/iisnode-msi/iisnode.wxs
@@ -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">

diff --git a/src/version.txt b/src/version.txt
@@ -1 +1 @@
-0.2.17
+0.2.18