update VC redist to 2015, fix nuget build for node 7.10.0, v7.10.1

tjanczuk · May 20, 2017 · 6a438d6 · 6a438d6
1 parent 4c36a4d
commit 6a438d6
Show file tree

Hide file tree

Showing 64 changed files with 45 additions and 17 deletions.
diff --git a/lib/bootstrap/project.json b/lib/bootstrap/project.json
@@ -10,7 +10,7 @@
           "type": "platform",
           "version": "1.0.0"
         },
-        "Edge.js": "7.10.0",
+        "Edge.js": "7.10.1",
         "Edge.js.CSharp": "1.2.0"
       }
     }

diff --git a/lib/native/win32/ia32/4.1.1/concrt140.dll b/lib/native/win32/ia32/4.1.1/concrt140.dll
diff --git a/lib/native/win32/ia32/4.1.1/edge_coreclr.node b/lib/native/win32/ia32/4.1.1/edge_coreclr.node
diff --git a/lib/native/win32/ia32/4.1.1/edge_nativeclr.node b/lib/native/win32/ia32/4.1.1/edge_nativeclr.node
diff --git a/lib/native/win32/ia32/4.1.1/vccorlib140.dll b/lib/native/win32/ia32/4.1.1/vccorlib140.dll
diff --git a/lib/native/win32/ia32/4.1.1/vcruntime140.dll b/lib/native/win32/ia32/4.1.1/vcruntime140.dll
diff --git a/lib/native/win32/ia32/5.1.0/concrt140.dll b/lib/native/win32/ia32/5.1.0/concrt140.dll
diff --git a/lib/native/win32/ia32/5.1.0/edge_coreclr.node b/lib/native/win32/ia32/5.1.0/edge_coreclr.node
diff --git a/lib/native/win32/ia32/5.1.0/edge_nativeclr.node b/lib/native/win32/ia32/5.1.0/edge_nativeclr.node
diff --git a/lib/native/win32/ia32/5.1.0/vccorlib140.dll b/lib/native/win32/ia32/5.1.0/vccorlib140.dll
diff --git a/lib/native/win32/ia32/5.1.0/vcruntime140.dll b/lib/native/win32/ia32/5.1.0/vcruntime140.dll
diff --git a/lib/native/win32/ia32/6.4.0/concrt140.dll b/lib/native/win32/ia32/6.4.0/concrt140.dll
diff --git a/lib/native/win32/ia32/6.4.0/edge_coreclr.node b/lib/native/win32/ia32/6.4.0/edge_coreclr.node
diff --git a/lib/native/win32/ia32/6.4.0/edge_nativeclr.node b/lib/native/win32/ia32/6.4.0/edge_nativeclr.node
diff --git a/lib/native/win32/ia32/6.4.0/vccorlib140.dll b/lib/native/win32/ia32/6.4.0/vccorlib140.dll
diff --git a/lib/native/win32/ia32/6.4.0/vcruntime140.dll b/lib/native/win32/ia32/6.4.0/vcruntime140.dll
diff --git a/lib/native/win32/ia32/7.10.0/concrt140.dll b/lib/native/win32/ia32/7.10.0/concrt140.dll
diff --git a/lib/native/win32/ia32/7.10.0/edge_coreclr.node b/lib/native/win32/ia32/7.10.0/edge_coreclr.node
diff --git a/lib/native/win32/ia32/7.10.0/edge_nativeclr.node b/lib/native/win32/ia32/7.10.0/edge_nativeclr.node
diff --git a/lib/native/win32/ia32/7.10.0/vccorlib140.dll b/lib/native/win32/ia32/7.10.0/vccorlib140.dll
diff --git a/lib/native/win32/ia32/7.10.0/vcruntime140.dll b/lib/native/win32/ia32/7.10.0/vcruntime140.dll
diff --git a/lib/native/win32/ia32/concrt140.dll b/lib/native/win32/ia32/concrt140.dll
diff --git a/lib/native/win32/ia32/msvcp120.dll b/lib/native/win32/ia32/msvcp120.dll
diff --git a/lib/native/win32/ia32/msvcp140.dll b/lib/native/win32/ia32/msvcp140.dll
diff --git a/lib/native/win32/ia32/msvcr120.dll b/lib/native/win32/ia32/msvcr120.dll
diff --git a/lib/native/win32/ia32/vccorlib140.dll b/lib/native/win32/ia32/vccorlib140.dll
diff --git a/lib/native/win32/ia32/vcruntime140.dll b/lib/native/win32/ia32/vcruntime140.dll
diff --git a/lib/native/win32/x64/4.1.1/concrt140.dll b/lib/native/win32/x64/4.1.1/concrt140.dll
diff --git a/lib/native/win32/x64/4.1.1/edge_coreclr.node b/lib/native/win32/x64/4.1.1/edge_coreclr.node
diff --git a/lib/native/win32/x64/4.1.1/edge_nativeclr.node b/lib/native/win32/x64/4.1.1/edge_nativeclr.node
diff --git a/lib/native/win32/x64/4.1.1/vccorlib140.dll b/lib/native/win32/x64/4.1.1/vccorlib140.dll
diff --git a/lib/native/win32/x64/4.1.1/vcruntime140.dll b/lib/native/win32/x64/4.1.1/vcruntime140.dll
diff --git a/lib/native/win32/x64/5.1.0/concrt140.dll b/lib/native/win32/x64/5.1.0/concrt140.dll
diff --git a/lib/native/win32/x64/5.1.0/edge_coreclr.node b/lib/native/win32/x64/5.1.0/edge_coreclr.node
diff --git a/lib/native/win32/x64/5.1.0/edge_nativeclr.node b/lib/native/win32/x64/5.1.0/edge_nativeclr.node
diff --git a/lib/native/win32/x64/5.1.0/vccorlib140.dll b/lib/native/win32/x64/5.1.0/vccorlib140.dll
diff --git a/lib/native/win32/x64/5.1.0/vcruntime140.dll b/lib/native/win32/x64/5.1.0/vcruntime140.dll
diff --git a/lib/native/win32/x64/6.4.0/concrt140.dll b/lib/native/win32/x64/6.4.0/concrt140.dll
diff --git a/lib/native/win32/x64/6.4.0/edge_coreclr.node b/lib/native/win32/x64/6.4.0/edge_coreclr.node
diff --git a/lib/native/win32/x64/6.4.0/edge_nativeclr.node b/lib/native/win32/x64/6.4.0/edge_nativeclr.node
diff --git a/lib/native/win32/x64/6.4.0/vccorlib140.dll b/lib/native/win32/x64/6.4.0/vccorlib140.dll
diff --git a/lib/native/win32/x64/6.4.0/vcruntime140.dll b/lib/native/win32/x64/6.4.0/vcruntime140.dll
diff --git a/lib/native/win32/x64/7.10.0/concrt140.dll b/lib/native/win32/x64/7.10.0/concrt140.dll
diff --git a/lib/native/win32/x64/7.10.0/edge_coreclr.node b/lib/native/win32/x64/7.10.0/edge_coreclr.node
diff --git a/lib/native/win32/x64/7.10.0/edge_nativeclr.node b/lib/native/win32/x64/7.10.0/edge_nativeclr.node
diff --git a/lib/native/win32/x64/7.10.0/vccorlib140.dll b/lib/native/win32/x64/7.10.0/vccorlib140.dll
diff --git a/lib/native/win32/x64/7.10.0/vcruntime140.dll b/lib/native/win32/x64/7.10.0/vcruntime140.dll
diff --git a/lib/native/win32/x64/concrt140.dll b/lib/native/win32/x64/concrt140.dll
diff --git a/lib/native/win32/x64/msvcp120.dll b/lib/native/win32/x64/msvcp120.dll
diff --git a/lib/native/win32/x64/msvcp140.dll b/lib/native/win32/x64/msvcp140.dll
diff --git a/lib/native/win32/x64/msvcr120.dll b/lib/native/win32/x64/msvcr120.dll
diff --git a/lib/native/win32/x64/vccorlib140.dll b/lib/native/win32/x64/vccorlib140.dll
diff --git a/lib/native/win32/x64/vcruntime140.dll b/lib/native/win32/x64/vcruntime140.dll
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "url": "http://tomasz.janczuk.org",
     "twitter": "tjanczuk"
   },
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Edge.js: run .NET and Node.js in-process on Windows, Mac OS, and Linux",
   "tags": [
     "owin",

diff --git a/src/double/Edge.js/project.json b/src/double/Edge.js/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "With Edge.js you can script Node.js in a .NET application. Edge.js allows you to run Node.js and .NET code in one process. You can call Node.js functions from .NET and .NET functions from Node.js. Edge.js takes care of marshalling data between CLR and V8. Edge.js also reconciles threading models of single threaded V8 and multi-threaded CLR. Edge.js ensures correct lifetime of objects on V8 and CLR heaps. This Edge.js NuGet package supports scripting Node.js v7.10.0.",
   "copyright": "Copyright 2015 Tomasz Janczuk",
   "packOptions": {

diff --git a/test/double/double_stress/double_stress.csproj b/test/double/double_stress/double_stress.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Edge.js.7.10.0\lib\net40\EdgeJs.dll</HintPath>
+      <HintPath>packages\Edge.js.7.10.1\lib\net40\EdgeJs.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/test/double/double_stress/packages.config b/test/double/double_stress/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Edge.js" version="7.10.0" targetFramework="net45" />
+  <package id="Edge.js" version="7.10.1" targetFramework="net45" />
 </packages>
diff --git a/test/double/double_test/DoubleEdge.cs b/test/double/double_test/DoubleEdge.cs
@@ -49,6 +49,18 @@ public void SucceedsForHelloWorld()
             Assert.AreEqual(result, "Node.js welcomes .NET");
         }
 
+        [TestMethod]
+        public void SucceedsCheckingNodeVersion()
+        {
+            var result = Edge.Func(@"
+                return function (data, cb) {
+                    cb(null, process.version);
+                }
+            ")(".NET").Result;
+
+            Assert.AreEqual(result, "v7.10.0");
+        }
+
         [TestMethod]
         public void SuccessfulyMarshalsDataFromNetToNode()
         {

diff --git a/test/double/double_test/double_test.csproj b/test/double/double_test/double_test.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Edge.js.7.10.0\lib\net40\EdgeJs.dll</HintPath>
+      <HintPath>packages\Edge.js.7.10.1\lib\net40\EdgeJs.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />

diff --git a/test/double/double_test/packages.config b/test/double/double_test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Edge.js" version="7.10.0" targetFramework="net45" />
+  <package id="Edge.js" version="7.10.1" targetFramework="net45" />
 </packages>
diff --git a/test/project.json b/test/project.json
@@ -23,7 +23,7 @@
           "type": "platform",
           "version": "1.0.0"
         },
-        "Edge.js": "7.10.0",
+        "Edge.js": "7.10.1",
         "Edge.js.CSharp": "1.2.0",
         "System.Xml.XmlSerializer": "4.0.11",
         "System.Xml.ReaderWriter": "4.0.11"

diff --git a/tools/build.bat b/tools/build.bat
@@ -67,9 +67,9 @@ if %ERRORLEVEL% neq 0 (
     exit /b -1
 )
 
-copy /y "%DESTDIR%\..\msvcr120.dll" "%DESTDIR%"
+copy /y "%DESTDIR%\..\*.dll" "%DESTDIR%"
 if %ERRORLEVEL% neq 0 (
-    echo Error copying msvcr120.dll %FLAVOR% to %DESTDIR%
+    echo Error copying VC redist %FLAVOR% to %DESTDIR%
     exit /b -1
 )
 

diff --git a/tools/build_double.bat b/tools/build_double.bat
@@ -1,4 +1,5 @@
-@echo off
+
+rem @echo off
 set SELF=%~dp0
 if "%1" equ "" (
     echo Usage: build_double.bat {node_version}
@@ -16,9 +17,9 @@ if not exist "%SELF%\build\download.exe" (
 	csc /out:"%SELF%\build\download.exe" "%SELF%\download.cs"
 )
 
-rem if not exist "%SELF%\build\unzip.exe" (
-rem 	csc /out:"%SELF%\build\unzip.exe" /r:System.IO.Compression.FileSystem.dll "%SELF%\unzip.cs"
-rem )
+if not exist "%SELF%\build\unzip.exe" (
+ 	csc /out:"%SELF%\build\unzip.exe" /r:System.IO.Compression.FileSystem.dll "%SELF%\unzip.cs"
+)
 
 if not exist "%SELF%\build\repl.exe" (
 	csc /out:"%SELF%\build\repl.exe" "%SELF%\repl.cs"
@@ -109,6 +110,8 @@ if exist "%SELF%\build\node-%1-%2\node.lib" exit /b 0
 
 pushd "%SELF%\build\node-%1"
 rmdir /s /q Release
+rmdir /s /q build
+rmdir /s /q tools\icu\Release
 
 ..\repl.exe node.gyp "'executable'" "'shared_library'"
 if %ERRORLEVEL% neq 0 (
@@ -117,7 +120,13 @@ if %ERRORLEVEL% neq 0 (
     exit /b -1
 )
 
-call vcbuild.bat build release %2
+call vcbuild.bat release %2
+if not exist .\Release\node.dll (
+    echo Cannot build node.dll for %1-%2
+    popd
+    exit /b -1
+)
+
 mkdir "%SELF%\build\node-%1-%2"
 copy /y .\Release\node.* "%SELF%\build\node-%1-%2"
 echo Finished building Node shared library %1

diff --git a/tools/install.js b/tools/install.js
@@ -38,7 +38,14 @@ if (process.platform === 'win32') {
 		.filter(isDirectory)
 		.map(getPath);
 
-	['msvcr120.dll', 'msvcp120.dll'].forEach(function (dllname) {
+	var redist = [
+        'concrt140.dll',
+        'msvcp140.dll',
+        'vccorlib140.dll',
+        'vcruntime140.dll',
+	];
+
+	redist.forEach(function (dllname) {
 		var dll32bit = path.resolve(lib32bit, dllname);
 		dest32dirs.forEach(copyFile(dll32bit, dllname));
 	});
@@ -48,7 +55,7 @@ if (process.platform === 'win32') {
 		.filter(isDirectory)
 		.map(getPath);
 
-	['msvcr120.dll', 'msvcp120.dll'].forEach(function (dllname) {
+	redist.forEach(function (dllname) {
 		var dll64bit = path.resolve(lib64bit, dllname);
 		dest64dirs.forEach(copyFile(dll64bit, dllname));
 	});