Merge remote-tracking branch 'upstream-rw/v0.10'

addaleax · Jun 17, 2014 · 4f1782e · 4f1782e
2 parents c047127 + e22ea56
commit 4f1782e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -622,7 +622,7 @@
 
 * openssl: to 1.0.1h (CVE-2014-0224)
 
-* npm: upgrade to 1.4.10
+* npm: upgrade to 1.4.14
 
 * utf8: Prevent Node from sending invalid UTF-8 (Felix Geisendörfer)
   - *NOTE* this introduces a breaking change, previously you could construct

diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj
@@ -58,11 +58,11 @@
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <Target Name="BeforeBuild">
-    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\deps\npm" PreprocessorVariable="var.NpmSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NpmSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\npm.wxs">
+    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\deps\npm" PreprocessorVariable="var.NpmSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NpmSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\npm.wxs" RunAsSeparateProcess="true">
     </HeatDirectory>
   </Target>
   <PropertyGroup>
     <PostBuildEvent>move "!(TargetPath)" "$(TargetDir)\$(TargetFileName)"
 move "!(TargetPdbPath)" "$(TargetDir)\$(TargetPdbName)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>