Skip to content

Commit

Permalink
node 9.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
agracio committed Nov 4, 2017
1 parent 759a1a0 commit a96b4a3
Show file tree
Hide file tree
Showing 19 changed files with 17 additions and 10 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ node_js:
- "6.11.5"
- "7.10.1"
- "8.8.1"
- "9.0.0"

install:
#- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF ; fi
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ environment:
- nodejs_version: "6.11.5"
- nodejs_version: "7.10.1"
- nodejs_version: "8.8.1"
- nodejs_version: "9.0.0"

install:
- ps: Install-Product node $env:nodejs_version
Expand Down
1 change: 1 addition & 0 deletions lib/edge.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var versionMap = [
[ /^6\./, '6.11.5' ],
[ /^7\./, '7.10.1' ],
[ /^8\./, '8.8.1' ],
[ /^9\./, '9.0.0' ],
];

function determineVersion() {
Expand Down
1 change: 1 addition & 0 deletions lib/native/win32/ia32/9.0.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file added lib/native/win32/ia32/9.0.0/edge_coreclr.node
Binary file not shown.
Binary file added lib/native/win32/ia32/9.0.0/edge_nativeclr.node
Binary file not shown.
1 change: 1 addition & 0 deletions lib/native/win32/x64/9.0.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
Binary file added lib/native/win32/x64/9.0.0/edge_coreclr.node
Binary file not shown.
Binary file added lib/native/win32/x64/9.0.0/edge_nativeclr.node
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "http://tomasz.janczuk.org",
"twitter": "tjanczuk"
},
"version": "8.8.1",
"version": "9.0.0",
"description": "Edge.js: run .NET and Node.js in-process on Windows, Mac OS, and Linux",
"tags": [
"owin",
Expand Down
2 changes: 1 addition & 1 deletion src/double/Edge.js/Edge.js.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<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 v6.5.0.</Description>
<Copyright>Copyright 2015 Tomasz Janczuk</Copyright>
<VersionPrefix>8.8.1</VersionPrefix>
<VersionPrefix>9.0.0</VersionPrefix>
<TargetFrameworks>net45;netcoreapp1.1</TargetFrameworks>
<AssemblyName>EdgeJs</AssemblyName>
<PackageId>Edge.js</PackageId>
Expand Down
4 changes: 2 additions & 2 deletions src/double/Edge.js/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "8.8.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 v8.8.1.",
"version": "9.0.0",
"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 v9.0.0.",
"copyright": "Copyright 2017 Tomasz Janczuk",
"packOptions": {
"summary": "Script Node.js in a .NET application.",
Expand Down
2 changes: 1 addition & 1 deletion test/double/double_test/DoubleEdge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void SucceedsCheckingNodeVersion()
")(".NET").Result;

System.Console.WriteLine(result);
Assert.AreEqual(result, "v8.8.1");
Assert.AreEqual(result, "v9.0.0");
}

[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion test/double/double_test/double_test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Edge.js.8.8.1\lib\net40\EdgeJs.dll</HintPath>
<HintPath>packages\Edge.js.9.0.0\lib\net40\EdgeJs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion test/double/double_test/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Edge.js" version="8.8.1" targetFramework="net45" />
<package id="Edge.js" version="9.0.0" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion test/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"type": "platform",
"version": "1.0.0"
},
"Edge.js": "8.8.1",
"Edge.js": "9.0.0",
"Edge.js.CSharp": "1.2.0",
"System.Xml.XmlSerializer": "4.0.11",
"System.Xml.ReaderWriter": "4.0.11"
Expand Down
2 changes: 2 additions & 0 deletions test/testall.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ if "%1"=="" set run64=Y
if "%1"=="x64" set run64=Y

if "%run32%"=="Y" (
call "%SELF%\test.bat" ia32 9.0.0
call "%SELF%\test.bat" ia32 8.8.1
call "%SELF%\test.bat" ia32 7.10.1
call "%SELF%\test.bat" ia32 6.11.5
)

if "%run64%"=="Y" (
call "%SELF%\test.bat" x64 9.0.0
call "%SELF%\test.bat" x64 8.8.1
call "%SELF%\test.bat" x64 7.10.1
call "%SELF%\test.bat" x64 6.11.5
Expand Down
2 changes: 1 addition & 1 deletion tools/build_double.bat
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ set GYP=%APPDATA%\npm\node_modules\node-gyp\bin\node-gyp.js

pushd "%SELF%\.."

"%NODEEXE%" "%GYP%" configure --msvs_version=2015
"%NODEEXE%" "%GYP%" configure --msvs_version=2017
"%SELF%\build\repl.exe" ./build/edge_nativeclr.vcxproj "%USERPROFILE%\.node-gyp\%1\%3\node.lib" "%SELF%build\node-%1-%2\node.lib"
"%NODEEXE%" "%GYP%" build
mkdir "%SELF%\build\nuget\content\edge\%2" > nul 2>&1
Expand Down
2 changes: 1 addition & 1 deletion tools/buildall.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
"%~dp0\build.bat" release 6.11.5 7.10.1 8.8.1
"%~dp0\build.bat" release 6.11.5 7.10.1 8.8.1 9.0.0

0 comments on commit a96b4a3

Please sign in to comment.