Upgrade to the 1.0.0-beta6 DNX

jalona · Aug 15, 2015 · 6b9d084 · 6b9d084
1 parent 4143882
commit 6b9d084
Show file tree

Hide file tree

Showing 13 changed files with 2,796 additions and 2,472 deletions.
diff --git a/global.json b/global.json
@@ -1,8 +1,8 @@
 {
   "projects": [ "src" ],
   "sdk": {
-    "version": "1.0.0-beta5",
-    "runtime": "clr",
+    "version": "1.0.0-beta6",
+    "runtime": "coreclr",
     "architecture": "x86"
   }
 }
diff --git a/src/OpenChain.Abstractions/project.lock.json b/src/OpenChain.Abstractions/project.lock.json
diff --git a/src/OpenChain.Ledger.Blockchain/project.lock.json b/src/OpenChain.Ledger.Blockchain/project.lock.json
diff --git a/src/OpenChain.Ledger/LedgerPath.cs b/src/OpenChain.Ledger/LedgerPath.cs
@@ -49,12 +49,12 @@ public static LedgerPath Parse(string path)
                 throw new ArgumentOutOfRangeException(nameof(path));
         }
 
-        public static LedgerPath FromSegments(string[] segments)
+        public static LedgerPath FromSegments(params string[] segments)
         {
             if (segments == null || segments.Any(segment => !IsValidPathSegment(segment) || segment == string.Empty))
                 throw new ArgumentOutOfRangeException(nameof(segments));
 
-            return new LedgerPath("/" + string.Join("/", segments) + "/", segments);
+            return new LedgerPath("/" + string.Join("/", segments.Select(segment => segment + "/")), segments);
         }
 
         public static bool IsValidPathSegment(string path)

diff --git a/src/OpenChain.Ledger/project.lock.json b/src/OpenChain.Ledger/project.lock.json
diff --git a/src/OpenChain.Server/Properties/launchSettings.json b/src/OpenChain.Server/Properties/launchSettings.json
@@ -9,7 +9,7 @@
     },
     "web": {
       "commandName": "web",
-      "sdkVersion": "dnx-coreclr-win-x86.1.0.0-beta5"
+      "sdkVersion": "dnx-coreclr-win-x86.1.0.0-beta6"
     }
   }
 }
diff --git a/src/OpenChain.Server/project.json b/src/OpenChain.Server/project.json
@@ -14,7 +14,6 @@
     "Microsoft.AspNet.Hosting": "1.0.0-beta6",
     "Microsoft.AspNet.Server.WebListener": "1.0.0-beta6",
     "Microsoft.AspNet.WebSockets.Server": "1.0.0-beta6",
-    "Microsoft.AspNet.WebSockets.Client": "1.0.0-beta6",
     "Microsoft.Framework.Logging.Console": "1.0.0-beta6",
     "Microsoft.Framework.Configuration.Json": "1.0.0-beta6",
     "Microsoft.Net.Http.Client": "1.0.0-beta6-10079",

diff --git a/src/OpenChain.Server/project.lock.json b/src/OpenChain.Server/project.lock.json