Fixing agracio/edge-js#24

agracio · Feb 22, 2018 · fe0ce38 · fe0ce38
1 parent cb94911
commit fe0ce38
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/bootstrap/bootstrap.csproj b/lib/bootstrap/bootstrap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>bootstrap</AssemblyName>
     <PackageId>bootstrap</PackageId>

diff --git a/lib/bootstrap/project.json b/lib/bootstrap/project.json
@@ -10,7 +10,7 @@
           "type": "platform",
           "version": "1.0.0"
         },
-        "Edge.js": "6.5.1",
+        "Edge.js": "7.10.1",
         "Edge.js.CSharp": "1.2.0"
       }
     }

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "url": "http://tomasz.janczuk.org",
     "twitter": "tjanczuk"
   },
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "Edge.js: run .NET and Node.js in-process on Electron",
   "tags": [
     "owin",
@@ -26,11 +26,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "edge-cs": "1.2.1",
-    "nan": "^2.7.0"
+    "nan": "^2.8.0"
   },
   "devDependencies": {
-    "mocha": "3.5.3",
-    "mocha-junit-reporter": "^1.14.0"
+    "mocha": "4.1.0",
+    "mocha-junit-reporter": "^1.15.0"
   },
   "homepage": "https://github.com/agracio/electron-edge-js",
   "repository": {

diff --git a/src/CoreCLREmbedding/coreclrembedding.cpp b/src/CoreCLREmbedding/coreclrembedding.cpp
@@ -334,7 +334,7 @@ HRESULT CoreClrEmbedding::Initialize(BOOL debugMode)
 
 	host_mode_t mode = coreclr_exists_in_dir(edgeAppDir) ? host_mode_t::standalone : host_mode_t::muxer;
 
-	if (mode == host_mode_t::standalone && dotnetExecutablePath.empty())
+	if (mode != host_mode_t::standalone && dotnetExecutablePath.empty())
 	{
 		throwV8Exception("This is not a published, standalone application and we are unable to locate the .NET Core SDK.  Please make sure that it is installed; see http://microsoft.com/net/core for more details.");
 	}