diff --git a/.travis.yml b/.travis.yml index ef04deed..4ed127b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: node_js node_js: - - "0.12" - - "0.10" + - "8" install: - sudo apt-key adv --keyserver pgp.mit.edu --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF diff --git a/README.md b/README.md index a85bbd55..541771f4 100644 --- a/README.md +++ b/README.md @@ -153,13 +153,13 @@ If you are writing a Node.js application, this section explains how you include ### What you need -Edge.js runs on Windows, Linux, and OSX and requires Node.js 7.x, 6.x, 5.x, 4.x, as well as .NET Framework 4.5 (Windows), Mono 4.2.4 (OSX, Linux), or .NET Core 1.0.0 Preview 2 (Windows, OSX, Linux). +Edge.js runs on Windows, Linux, and OSX and requires Node.js 8.x, 7.x, 6.x, as well as .NET Framework 4.5 (Windows), Mono 4.2.4 (OSX, Linux), or .NET Core 1.0.0 Preview 2 (Windows, OSX, Linux). **NOTE** there is a known issue with Mono after 4.2.4 that will be addressed in Mono 4.6. #### Windows -* Node.js 7.x, 6.x, 5.x, or 4.x +* Node.js 8.x, 7.x, or 6.x * [.NET 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653) and/or [.NET Core](https://www.microsoft.com/net/core) * to use Python, you also need [IronPython 2.7.3 or later](http://ironpython.codeplex.com/releases/view/81726) * to use F#, read [Dave Thomas blog post](http://7sharpnine.com/blog/2013-05-05-i-node-something/) @@ -170,7 +170,7 @@ If you have both desktop CLR and .NET Core installed, read [using .NET Core](#us #### Linux -* Node.js 7.x, 6.x, 5.x, or 4.x +* Node.js 8.x, 7.x, or 6.x * Mono 4.2.4 x64 and/or .NET Core * Follow [Linux setup instructions](#building-on-linux) @@ -178,7 +178,7 @@ If you have both desktop CLR and .NET Core installed, read [using .NET Core](#us #### OSX -* Node.js 7.x, 6.x, 5.x, or 4.x, +* Node.js 8.x, 7.x, or 6.x * Mono 4.2.4 x64 and/or .NET Core * Follow [OSX setup instructions](#building-on-osx) @@ -1217,7 +1217,7 @@ To build one of the versions of Node.js officially released by [Node.js](http:// ``` cd tools -build.bat release 7.10.0 +build.bat release 8.2.1 ``` Note: the Node.js version number you provide must be version number corresponding to one of the subdirectories of http://nodejs.org/dist. The command will build both x32 and x64 architectures (assuming you use x64 machine). The command will also copy the edge\_\*.node executables to appropriate locations under lib\native directory where they are looked up from at runtime. The `npm install` step copies the C standard library shared DLL to the location of the edge\_\*.node files for the component to be ready to go. @@ -1373,7 +1373,7 @@ You need Windows with: * [Edge.js NuGet package](https://www.nuget.org/packages/Edge.js) * [Node.js](http://nodejs.org) (optional, if you want to use additional NPM packages) -Edge.js support for scripting Node.js ships as a NuGet Package called `Edge.js`. It comes with everything you need to get started writing applications for x86 and x64 architectures. However, if you want to use additional Node.js packages from NPM, you must separately install Node.js runtime to access the NPM package manager. Edge.js NuGet package has been developed and tested with Node.js v7.10.0. Older Edge.js packages exist for prior versions of Node.js. If you choose a different version of Node.js to install NPM packages, your mileage can vary. +Edge.js support for scripting Node.js ships as a NuGet Package called `Edge.js`. It comes with everything you need to get started writing applications for x86 and x64 architectures. However, if you want to use additional Node.js packages from NPM, you must separately install Node.js runtime to access the NPM package manager. The latest Edge.js NuGet package has been developed and tested with Node.js v8.2.1. Older Edge.js packages exist for prior versions of Node.js. If you choose a different version of Node.js to install NPM packages, your mileage can vary. **NOTE** you cannot use native Node.js extensions when scripting Node.js from CLR using Edge. @@ -1688,14 +1688,14 @@ These are unstructions for building the Edge.js NuGet package on Windows. The pa Preprequisties: * Visual Studio 2015 -* Node.js (tested with v7.10.0) +* Node.js (tested with v8.2.1) * Python 2.7.x * node-gyp (tested with 3.6.1) To buid the NuGet package, open the Visual Studio 2013 Developer Command Prompt and call: ``` -tools\build_double.bat 7.10.0 +tools\build_double.bat 8.2.1 ``` (you can substitite another version of Node.js). diff --git a/lib/edge.js b/lib/edge.js index e3ab84e7..855b788d 100644 --- a/lib/edge.js +++ b/lib/edge.js @@ -4,10 +4,9 @@ var fs = require('fs') , edge; var versionMap = [ - [ /^4\./, '4.1.1' ], - [ /^5\./, '5.1.0' ], - [ /^6\./, '6.4.0' ], - [ /^7\./, '7.10.0' ], + [ /^6\./, '6.11.2' ], + [ /^7\./, '7.10.1' ], + [ /^8\./, '8.2.1' ], ]; function determineVersion() { diff --git a/lib/native/win32/ia32/4.1.1/.gitignore b/lib/native/win32/ia32/4.1.1/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/ia32/4.1.1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/4.1.1/concrt140.dll b/lib/native/win32/ia32/4.1.1/concrt140.dll deleted file mode 100644 index 4f9ed11a..00000000 Binary files a/lib/native/win32/ia32/4.1.1/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/4.1.1/edge_coreclr.node b/lib/native/win32/ia32/4.1.1/edge_coreclr.node deleted file mode 100644 index 23e93563..00000000 Binary files a/lib/native/win32/ia32/4.1.1/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/4.1.1/edge_nativeclr.node b/lib/native/win32/ia32/4.1.1/edge_nativeclr.node deleted file mode 100644 index e02cc916..00000000 Binary files a/lib/native/win32/ia32/4.1.1/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/4.1.1/vccorlib140.dll b/lib/native/win32/ia32/4.1.1/vccorlib140.dll deleted file mode 100644 index 48f5789c..00000000 Binary files a/lib/native/win32/ia32/4.1.1/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/4.1.1/vcruntime140.dll b/lib/native/win32/ia32/4.1.1/vcruntime140.dll deleted file mode 100644 index 21c18f7e..00000000 Binary files a/lib/native/win32/ia32/4.1.1/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/5.1.0/.gitignore b/lib/native/win32/ia32/5.1.0/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/ia32/5.1.0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/5.1.0/concrt140.dll b/lib/native/win32/ia32/5.1.0/concrt140.dll deleted file mode 100644 index 4f9ed11a..00000000 Binary files a/lib/native/win32/ia32/5.1.0/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/5.1.0/edge_nativeclr.node b/lib/native/win32/ia32/5.1.0/edge_nativeclr.node deleted file mode 100644 index 1f01a1a5..00000000 Binary files a/lib/native/win32/ia32/5.1.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/ia32/5.1.0/vccorlib140.dll b/lib/native/win32/ia32/5.1.0/vccorlib140.dll deleted file mode 100644 index 48f5789c..00000000 Binary files a/lib/native/win32/ia32/5.1.0/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/5.1.0/vcruntime140.dll b/lib/native/win32/ia32/5.1.0/vcruntime140.dll deleted file mode 100644 index 21c18f7e..00000000 Binary files a/lib/native/win32/ia32/5.1.0/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/6.11.2/.gitignore b/lib/native/win32/ia32/6.11.2/.gitignore new file mode 100644 index 00000000..ea236163 --- /dev/null +++ b/lib/native/win32/ia32/6.11.2/.gitignore @@ -0,0 +1 @@ +*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/6.4.0/edge_coreclr.node b/lib/native/win32/ia32/6.11.2/edge_coreclr.node similarity index 96% rename from lib/native/win32/ia32/6.4.0/edge_coreclr.node rename to lib/native/win32/ia32/6.11.2/edge_coreclr.node index 31a29234..a6684d35 100644 Binary files a/lib/native/win32/ia32/6.4.0/edge_coreclr.node and b/lib/native/win32/ia32/6.11.2/edge_coreclr.node differ diff --git a/lib/native/win32/ia32/6.4.0/edge_nativeclr.node b/lib/native/win32/ia32/6.11.2/edge_nativeclr.node similarity index 61% rename from lib/native/win32/ia32/6.4.0/edge_nativeclr.node rename to lib/native/win32/ia32/6.11.2/edge_nativeclr.node index 49b1bc80..a8e2cf9c 100644 Binary files a/lib/native/win32/ia32/6.4.0/edge_nativeclr.node and b/lib/native/win32/ia32/6.11.2/edge_nativeclr.node differ diff --git a/lib/native/win32/ia32/6.4.0/.gitignore b/lib/native/win32/ia32/6.4.0/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/ia32/6.4.0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/6.4.0/concrt140.dll b/lib/native/win32/ia32/6.4.0/concrt140.dll deleted file mode 100644 index 4f9ed11a..00000000 Binary files a/lib/native/win32/ia32/6.4.0/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/6.4.0/vccorlib140.dll b/lib/native/win32/ia32/6.4.0/vccorlib140.dll deleted file mode 100644 index 48f5789c..00000000 Binary files a/lib/native/win32/ia32/6.4.0/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/6.4.0/vcruntime140.dll b/lib/native/win32/ia32/6.4.0/vcruntime140.dll deleted file mode 100644 index 21c18f7e..00000000 Binary files a/lib/native/win32/ia32/6.4.0/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/7.10.0/.gitignore b/lib/native/win32/ia32/7.10.0/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/ia32/7.10.0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/7.10.0/concrt140.dll b/lib/native/win32/ia32/7.10.0/concrt140.dll deleted file mode 100644 index 4f9ed11a..00000000 Binary files a/lib/native/win32/ia32/7.10.0/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/7.10.0/vccorlib140.dll b/lib/native/win32/ia32/7.10.0/vccorlib140.dll deleted file mode 100644 index 48f5789c..00000000 Binary files a/lib/native/win32/ia32/7.10.0/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/7.10.0/vcruntime140.dll b/lib/native/win32/ia32/7.10.0/vcruntime140.dll deleted file mode 100644 index 21c18f7e..00000000 Binary files a/lib/native/win32/ia32/7.10.0/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/ia32/7.10.1/.gitignore b/lib/native/win32/ia32/7.10.1/.gitignore new file mode 100644 index 00000000..ea236163 --- /dev/null +++ b/lib/native/win32/ia32/7.10.1/.gitignore @@ -0,0 +1 @@ +*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/7.10.0/edge_coreclr.node b/lib/native/win32/ia32/7.10.1/edge_coreclr.node similarity index 99% rename from lib/native/win32/ia32/7.10.0/edge_coreclr.node rename to lib/native/win32/ia32/7.10.1/edge_coreclr.node index 69b504c5..dfc0ec99 100644 Binary files a/lib/native/win32/ia32/7.10.0/edge_coreclr.node and b/lib/native/win32/ia32/7.10.1/edge_coreclr.node differ diff --git a/lib/native/win32/ia32/7.10.0/edge_nativeclr.node b/lib/native/win32/ia32/7.10.1/edge_nativeclr.node similarity index 99% rename from lib/native/win32/ia32/7.10.0/edge_nativeclr.node rename to lib/native/win32/ia32/7.10.1/edge_nativeclr.node index bd35df6b..3ac57990 100644 Binary files a/lib/native/win32/ia32/7.10.0/edge_nativeclr.node and b/lib/native/win32/ia32/7.10.1/edge_nativeclr.node differ diff --git a/lib/native/win32/ia32/8.2.1/.gitignore b/lib/native/win32/ia32/8.2.1/.gitignore new file mode 100644 index 00000000..ea236163 --- /dev/null +++ b/lib/native/win32/ia32/8.2.1/.gitignore @@ -0,0 +1 @@ +*.dll \ No newline at end of file diff --git a/lib/native/win32/ia32/5.1.0/edge_coreclr.node b/lib/native/win32/ia32/8.2.1/edge_coreclr.node similarity index 67% rename from lib/native/win32/ia32/5.1.0/edge_coreclr.node rename to lib/native/win32/ia32/8.2.1/edge_coreclr.node index f635f724..7cd6f2a9 100644 Binary files a/lib/native/win32/ia32/5.1.0/edge_coreclr.node and b/lib/native/win32/ia32/8.2.1/edge_coreclr.node differ diff --git a/lib/native/win32/ia32/8.2.1/edge_nativeclr.node b/lib/native/win32/ia32/8.2.1/edge_nativeclr.node new file mode 100644 index 00000000..f4ad63cc Binary files /dev/null and b/lib/native/win32/ia32/8.2.1/edge_nativeclr.node differ diff --git a/lib/native/win32/x64/4.1.1/.gitignore b/lib/native/win32/x64/4.1.1/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/x64/4.1.1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/4.1.1/concrt140.dll b/lib/native/win32/x64/4.1.1/concrt140.dll deleted file mode 100644 index 915a13a3..00000000 Binary files a/lib/native/win32/x64/4.1.1/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/x64/4.1.1/edge_nativeclr.node b/lib/native/win32/x64/4.1.1/edge_nativeclr.node deleted file mode 100644 index 72a50a25..00000000 Binary files a/lib/native/win32/x64/4.1.1/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/x64/4.1.1/vccorlib140.dll b/lib/native/win32/x64/4.1.1/vccorlib140.dll deleted file mode 100644 index d3cc8e00..00000000 Binary files a/lib/native/win32/x64/4.1.1/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/x64/4.1.1/vcruntime140.dll b/lib/native/win32/x64/4.1.1/vcruntime140.dll deleted file mode 100644 index 52fe06bd..00000000 Binary files a/lib/native/win32/x64/4.1.1/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/x64/5.1.0/.gitignore b/lib/native/win32/x64/5.1.0/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/x64/5.1.0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/5.1.0/concrt140.dll b/lib/native/win32/x64/5.1.0/concrt140.dll deleted file mode 100644 index 915a13a3..00000000 Binary files a/lib/native/win32/x64/5.1.0/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/x64/5.1.0/edge_coreclr.node b/lib/native/win32/x64/5.1.0/edge_coreclr.node deleted file mode 100644 index 9440bf99..00000000 Binary files a/lib/native/win32/x64/5.1.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/x64/5.1.0/edge_nativeclr.node b/lib/native/win32/x64/5.1.0/edge_nativeclr.node deleted file mode 100644 index 9195f20b..00000000 Binary files a/lib/native/win32/x64/5.1.0/edge_nativeclr.node and /dev/null differ diff --git a/lib/native/win32/x64/5.1.0/vccorlib140.dll b/lib/native/win32/x64/5.1.0/vccorlib140.dll deleted file mode 100644 index d3cc8e00..00000000 Binary files a/lib/native/win32/x64/5.1.0/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/x64/5.1.0/vcruntime140.dll b/lib/native/win32/x64/5.1.0/vcruntime140.dll deleted file mode 100644 index 52fe06bd..00000000 Binary files a/lib/native/win32/x64/5.1.0/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/x64/6.11.2/.gitignore b/lib/native/win32/x64/6.11.2/.gitignore new file mode 100644 index 00000000..ea236163 --- /dev/null +++ b/lib/native/win32/x64/6.11.2/.gitignore @@ -0,0 +1 @@ +*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/4.1.1/edge_coreclr.node b/lib/native/win32/x64/6.11.2/edge_coreclr.node similarity index 93% rename from lib/native/win32/x64/4.1.1/edge_coreclr.node rename to lib/native/win32/x64/6.11.2/edge_coreclr.node index 235a4331..616e9d34 100644 Binary files a/lib/native/win32/x64/4.1.1/edge_coreclr.node and b/lib/native/win32/x64/6.11.2/edge_coreclr.node differ diff --git a/lib/native/win32/x64/6.4.0/edge_nativeclr.node b/lib/native/win32/x64/6.11.2/edge_nativeclr.node similarity index 53% rename from lib/native/win32/x64/6.4.0/edge_nativeclr.node rename to lib/native/win32/x64/6.11.2/edge_nativeclr.node index 966c2561..69447de4 100644 Binary files a/lib/native/win32/x64/6.4.0/edge_nativeclr.node and b/lib/native/win32/x64/6.11.2/edge_nativeclr.node differ diff --git a/lib/native/win32/x64/6.4.0/.gitignore b/lib/native/win32/x64/6.4.0/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/x64/6.4.0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/6.4.0/concrt140.dll b/lib/native/win32/x64/6.4.0/concrt140.dll deleted file mode 100644 index 915a13a3..00000000 Binary files a/lib/native/win32/x64/6.4.0/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/x64/6.4.0/edge_coreclr.node b/lib/native/win32/x64/6.4.0/edge_coreclr.node deleted file mode 100644 index 8479c3bb..00000000 Binary files a/lib/native/win32/x64/6.4.0/edge_coreclr.node and /dev/null differ diff --git a/lib/native/win32/x64/6.4.0/vccorlib140.dll b/lib/native/win32/x64/6.4.0/vccorlib140.dll deleted file mode 100644 index d3cc8e00..00000000 Binary files a/lib/native/win32/x64/6.4.0/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/x64/6.4.0/vcruntime140.dll b/lib/native/win32/x64/6.4.0/vcruntime140.dll deleted file mode 100644 index 52fe06bd..00000000 Binary files a/lib/native/win32/x64/6.4.0/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/x64/7.10.0/.gitignore b/lib/native/win32/x64/7.10.0/.gitignore deleted file mode 100644 index 7f54baf9..00000000 --- a/lib/native/win32/x64/7.10.0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ms*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/7.10.0/concrt140.dll b/lib/native/win32/x64/7.10.0/concrt140.dll deleted file mode 100644 index 915a13a3..00000000 Binary files a/lib/native/win32/x64/7.10.0/concrt140.dll and /dev/null differ diff --git a/lib/native/win32/x64/7.10.0/vccorlib140.dll b/lib/native/win32/x64/7.10.0/vccorlib140.dll deleted file mode 100644 index d3cc8e00..00000000 Binary files a/lib/native/win32/x64/7.10.0/vccorlib140.dll and /dev/null differ diff --git a/lib/native/win32/x64/7.10.0/vcruntime140.dll b/lib/native/win32/x64/7.10.0/vcruntime140.dll deleted file mode 100644 index 52fe06bd..00000000 Binary files a/lib/native/win32/x64/7.10.0/vcruntime140.dll and /dev/null differ diff --git a/lib/native/win32/x64/7.10.1/.gitignore b/lib/native/win32/x64/7.10.1/.gitignore new file mode 100644 index 00000000..ea236163 --- /dev/null +++ b/lib/native/win32/x64/7.10.1/.gitignore @@ -0,0 +1 @@ +*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/7.10.0/edge_coreclr.node b/lib/native/win32/x64/7.10.1/edge_coreclr.node similarity index 99% rename from lib/native/win32/x64/7.10.0/edge_coreclr.node rename to lib/native/win32/x64/7.10.1/edge_coreclr.node index 0b1837dd..2d287eb4 100644 Binary files a/lib/native/win32/x64/7.10.0/edge_coreclr.node and b/lib/native/win32/x64/7.10.1/edge_coreclr.node differ diff --git a/lib/native/win32/x64/7.10.0/edge_nativeclr.node b/lib/native/win32/x64/7.10.1/edge_nativeclr.node similarity index 99% rename from lib/native/win32/x64/7.10.0/edge_nativeclr.node rename to lib/native/win32/x64/7.10.1/edge_nativeclr.node index d3f09024..620048f6 100644 Binary files a/lib/native/win32/x64/7.10.0/edge_nativeclr.node and b/lib/native/win32/x64/7.10.1/edge_nativeclr.node differ diff --git a/lib/native/win32/x64/8.2.1/.gitignore b/lib/native/win32/x64/8.2.1/.gitignore new file mode 100644 index 00000000..ea236163 --- /dev/null +++ b/lib/native/win32/x64/8.2.1/.gitignore @@ -0,0 +1 @@ +*.dll \ No newline at end of file diff --git a/lib/native/win32/x64/8.2.1/edge_coreclr.node b/lib/native/win32/x64/8.2.1/edge_coreclr.node new file mode 100644 index 00000000..8843869d Binary files /dev/null and b/lib/native/win32/x64/8.2.1/edge_coreclr.node differ diff --git a/lib/native/win32/x64/8.2.1/edge_nativeclr.node b/lib/native/win32/x64/8.2.1/edge_nativeclr.node new file mode 100644 index 00000000..9a08a607 Binary files /dev/null and b/lib/native/win32/x64/8.2.1/edge_nativeclr.node differ diff --git a/package.json b/package.json index f9311744..630a0cd3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "http://tomasz.janczuk.org", "twitter": "tjanczuk" }, - "version": "7.10.1", + "version": "8.2.1", "description": "Edge.js: run .NET and Node.js in-process on Windows, Mac OS, and Linux", "tags": [ "owin", @@ -20,7 +20,7 @@ ], "main": "./lib/edge.js", "engines": { - "node": ">= 0.8" + "node": ">= 6" }, "licenses": [ { diff --git a/src/double/Edge.js/project.json b/src/double/Edge.js/project.json index 0dea605e..8ef018db 100644 --- a/src/double/Edge.js/project.json +++ b/src/double/Edge.js/project.json @@ -1,7 +1,7 @@ { - "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", + "version": "8.2.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.2.1.", + "copyright": "Copyright 2017 Tomasz Janczuk", "packOptions": { "summary": "Script Node.js in a .NET application.", "projectUrl": "https://github.com/tjanczuk/edge", diff --git a/test/double/double_test/DoubleEdge.cs b/test/double/double_test/DoubleEdge.cs index 4df3581f..8f377490 100644 --- a/test/double/double_test/DoubleEdge.cs +++ b/test/double/double_test/DoubleEdge.cs @@ -58,7 +58,8 @@ public void SucceedsCheckingNodeVersion() } ")(".NET").Result; - Assert.AreEqual(result, "v7.10.0"); + System.Console.WriteLine(result); + Assert.AreEqual(result, "v8.2.1"); } [TestMethod] diff --git a/test/double/double_test/double_test.csproj b/test/double/double_test/double_test.csproj index cbb3f770..6175fb82 100644 --- a/test/double/double_test/double_test.csproj +++ b/test/double/double_test/double_test.csproj @@ -36,7 +36,7 @@ - packages\Edge.js.7.10.1\lib\net40\EdgeJs.dll + packages\Edge.js.8.2.1\lib\net40\EdgeJs.dll True diff --git a/test/double/double_test/packages.config b/test/double/double_test/packages.config index d0c4e119..bdd281a9 100644 --- a/test/double/double_test/packages.config +++ b/test/double/double_test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/test/project.json b/test/project.json index 78d560f9..e2b8b6cd 100644 --- a/test/project.json +++ b/test/project.json @@ -23,7 +23,7 @@ "type": "platform", "version": "1.0.0" }, - "Edge.js": "7.10.1", + "Edge.js": "8.2.1", "Edge.js.CSharp": "1.2.0", "System.Xml.XmlSerializer": "4.0.11", "System.Xml.ReaderWriter": "4.0.11" diff --git a/test/testall.bat b/test/testall.bat index b0c562a3..ca266d9e 100644 --- a/test/testall.bat +++ b/test/testall.bat @@ -10,15 +10,13 @@ if "%1"=="" set run64=Y if "%1"=="x64" set run64=Y if "%run32%"=="Y" ( - call "%SELF%\test.bat" ia32 7.10.0 - call "%SELF%\test.bat" ia32 6.4.0 - call "%SELF%\test.bat" ia32 4.1.1 - call "%SELF%\test.bat" ia32 5.1.0 + call "%SELF%\test.bat" ia32 8.2.1 + call "%SELF%\test.bat" ia32 7.10.1 + call "%SELF%\test.bat" ia32 6.11.2 ) if "%run64%"=="Y" ( - call "%SELF%\test.bat" x64 7.10.0 - call "%SELF%\test.bat" x64 6.4.0 - call "%SELF%\test.bat" x64 4.1.1 - call "%SELF%\test.bat" x64 5.1.0 + call "%SELF%\test.bat" x64 8.2.1 + call "%SELF%\test.bat" x64 7.10.1 + call "%SELF%\test.bat" x64 6.11.2 ) \ No newline at end of file diff --git a/tools/buildall.bat b/tools/buildall.bat index 76bea5b2..89202db8 100644 --- a/tools/buildall.bat +++ b/tools/buildall.bat @@ -1,2 +1,2 @@ @echo off -"%~dp0\build.bat" release 4.1.1 5.1.0 6.4.0 7.10.0 +"%~dp0\build.bat" release 6.11.2 7.10.1 8.2.1