Merge remote-tracking branch 'refs/remotes/tjanczuk/master'

okwh · Aug 30, 2016 · 9f179c1 · 9f179c1
2 parents b5a34dc 5eef6f6
commit 9f179c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/bootstrap/project.json b/lib/bootstrap/project.json
@@ -11,7 11,7 @@
  "version": "1.0.0"
  },
  "Edge.js": "6.4.0",
- "Edge.js.CSharp": "1.0.0"
  "Edge.js.CSharp": "1.2.0"
  }
  }
  },

diff --git a/package.json b/package.json
@@ -29,7 29,7 @@
  }
  ],
  "dependencies": {
- "edge-cs": "1.0.0",
  "edge-cs": "1.2.1",
  "nan": "^2.0.9"
  },
  "devDependencies": {

diff --git a/src/mono/clrfunc.cpp b/src/mono/clrfunc.cpp
@@ -243,7 243,7 @@ v8::Local<v8::Value> ClrFunc::MarshalCLRToV8(MonoObject* netdata, MonoException*
  {
  if(enableMarshalEnumAsInt)
  {
- jsdata = NanNew<v8::Integer>(*(int32_t*)mono_object_unbox(netdata));
  jsdata = Nan::New<v8::Integer>(*(int32_t*)mono_object_unbox(netdata));
  }
  else
  {

diff --git a/test/project.json b/test/project.json
@@ -23,8 23,8 @@
  "type": "platform",
  "version": "1.0.0"
  },
- "Edge.js": "5.9.2",
- "Edge.js.CSharp": "1.0.0"
  "Edge.js": "6.4.0",
  "Edge.js.CSharp": "1.2.0"
  }
  }
  },