Merge pull request #436 from tetious/dotnet-core-shell

Add dotnet core support for shell
mbdavid · Jan 24, 2017 · eb94a2a · eb94a2a
2 parents c99cf36 + ae1b874
commit eb94a2a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/LiteDB.Shell/Commands/Collections/Bulk.cs b/LiteDB.Shell/Commands/Collections/Bulk.cs
@@ -18,7 +18,7 @@ public void Execute(LiteEngine engine, StringScanner s, Display display, InputCo
             var col = this.ReadCollection(engine, s);
             var filename = s.Scan(@".*");
 
-            using (var sr = new StreamReader(filename, Encoding.UTF8))
+            using (var sr = new StreamReader(new FileStream(filename, System.IO.FileMode.Open)))
             {
                 var docs = JsonSerializer.DeserializeArray(sr);
 

diff --git a/LiteDB.Shell/Commands/Console/ShowCollections.cs b/LiteDB.Shell/Commands/Console/ShowCollections.cs
@@ -14,6 +14,12 @@ public bool IsCommand(StringScanner s)
 
         public void Execute(LiteEngine engine, StringScanner s, Display display, InputCommand input, Env env)
         {
+            if(engine == null)
+            {
+                display.WriteError("No database file currently open.");
+                return;
+            }
+
             var cols = engine.GetCollectionNames().OrderBy(x => x).ToArray();
 
             if (cols.Length > 0)

diff --git a/LiteDB.Shell/Shell/Env.cs b/LiteDB.Shell/Shell/Env.cs
@@ -28,7 +28,11 @@ public LiteEngine CreateEngine(DataAccess access)
             var disk = new FileDiskService(this.Filename,
                 new FileOptions
                 {
-                    FileMode = FileMode.Shared,
+                    #if NET35
+                        FileMode = FileMode.Shared,
+                    #else
+                        FileMode = FileMode.Exclusive,                    
+                    #endif
                     Journal = this.Journal
                 });
 

diff --git a/LiteDB.Shell/Shell/ShellProgram.cs b/LiteDB.Shell/Shell/ShellProgram.cs
@@ -66,9 +66,9 @@ public static void Start(InputCommand input, Display display)
         public static void RegisterCommands(List<ICommand> commands)
         {
             var type = typeof(ICommand);
-            var types = Assembly.GetExecutingAssembly()
+            var types = typeof(ShellProgram).GetTypeInfo().Assembly
                 .GetTypes()
-                .Where(p => type.IsAssignableFrom(p) && p.IsClass);
+                .Where(p => type.IsAssignableFrom(p) && p.GetTypeInfo().IsClass);
 
             foreach(var cmd in types)
             {

diff --git a/LiteDB.Shell/project.json b/LiteDB.Shell/project.json
@@ -0,0 +1,21 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "LiteDB": "3.0.0"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.1"
+        }
+      },
+      "imports": "dnxcore50"
+    }
+  }
+}