Fixes #6 - brings master up to beta 5. Package publish soon.

Author: nblumhardt

global.json

@@ -1,6 +1,6 @@
-{
-    "projects": [ "src", "test" ],
-    "sdk": {
-        "version": "1.0.0-beta4"
-    }
-}
+{
+    "projects": [ "src", "test" ],
+    "sdk": {
+        "version": "1.0.0-beta5"
+    }
+}

samples/MvcSample/Startup.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Hosting;
-using Microsoft.Framework.ConfigurationModel;
+using Microsoft.Framework.Configuration;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Logging;
 using Serilog;
@@ -12,16 +12,17 @@ public class Startup
     {
         public Startup(IHostingEnvironment env)
         {
-            Configuration = new Configuration()
+            Configuration = new ConfigurationBuilder()
                 .AddJsonFile("config.json")
-                .AddEnvironmentVariables();
+                .AddEnvironmentVariables()
+                .Build();
         }
 
         public IConfiguration Configuration { get; set; }
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.Configure<AppSettings>(Configuration.GetSubKey("AppSettings"));
+            services.Configure<AppSettings>(Configuration.GetConfigurationSection("AppSettings"));
 
             services.AddMvc();
         }

samples/MvcSample/project.json

@@ -3,17 +3,17 @@
     "version": "1.0.0-*",
 
     "dependencies": {
-        "Microsoft.AspNet.Diagnostics": "1.0.0-beta5-13065",
-        "Microsoft.AspNet.Mvc": "6.0.0-beta5-13890",
-        "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta5-13890",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-beta5-11775",
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-beta5-12160",
-        "Microsoft.AspNet.StaticFiles": "1.0.0-beta5-11935",
-        "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta5-13375",
-        "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta5-11337",
-        "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta5-12298",
-        "Microsoft.Framework.Logging": "1.0.0-beta5-11361",
-        "Microsoft.Framework.Logging.Console": "1.0.0-beta5-11361",
+        "Microsoft.AspNet.Diagnostics": "1.0.0-beta5",
+        "Microsoft.AspNet.Mvc": "6.0.0-beta5",
+        "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta5",
+        "Microsoft.AspNet.Server.IIS": "1.0.0-beta5",
+        "Microsoft.AspNet.Server.WebListener": "1.0.0-beta5",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-beta5",
+        "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta5",
+        "Microsoft.Framework.Configuration.Json": "1.0.0-beta5",
+        "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta5",
+        "Microsoft.Framework.Logging": "1.0.0-beta5",
+        "Microsoft.Framework.Logging.Console": "1.0.0-beta5",
         "Serilog.Framework.Logging": "1.0.0-*"
     },