Merge pull request reactjs#152 from Sorting/master

Upgrade to ASP.NET 5 Beta 6

Author: Daniel15

src/React.AspNet/project.json

@@ -15,10 +15,11 @@
         }
     },
     "dependencies": {
-        "Microsoft.Framework.DependencyInjection": "1.0.0-beta5",
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-beta5",
-        "Microsoft.AspNet.StaticFiles": "1.0.0-beta5",
-        "Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta5",
+        "Microsoft.Framework.DependencyInjection": "1.0.0-beta6",
+        "Microsoft.AspNet.Mvc.Core": "6.0.0-beta6",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-beta6",
+        "Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta6",
+        "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-beta6",
         "React.Core": "",
         "JavaScriptEngineSwitcher.Core": "1.2.4.0"
     },

src/React.Sample.Mvc6/Startup.cs

@@ -50,10 +50,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 			loggerfactory.AddConsole();
 
 			// Add the following to the request pipeline only in development environment.
-			if (string.Equals(env.EnvironmentName, "Development", StringComparison.OrdinalIgnoreCase))
+			if (env.IsDevelopment())
 			{
 				//app.UseBrowserLink();
-				app.UseErrorPage(ErrorPageOptions.ShowAll);
+				app.UseErrorPage();
 			}
 			else
 			{

src/React.Sample.Mvc6/project.json

@@ -2,15 +2,15 @@
     "webroot": "wwwroot",
     "version": "1.5.3-*",
     "dependencies": {
-        "Microsoft.AspNet.Mvc": "6.0.0-beta5",
-        "Microsoft.AspNet.Diagnostics": "1.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.Framework.Configuration.EnvironmentVariables": "1.0.0-beta5",
-        "Microsoft.Framework.Configuration.Json": "1.0.0-beta5", 
-        "Microsoft.Framework.Logging": "1.0.0-beta5",
-        "Microsoft.Framework.Logging.Console": "1.0.0-beta5",
+        "Microsoft.AspNet.Mvc": "6.0.0-beta6",
+        "Microsoft.AspNet.Diagnostics": "1.0.0-beta6",
+        "Microsoft.AspNet.Server.IIS": "1.0.0-beta6",
+        "Microsoft.AspNet.Server.WebListener": "1.0.0-beta6",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-beta6",
+        "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-beta6",
+        "Microsoft.Framework.Configuration.Json": "1.0.0-beta6", 
+        "Microsoft.Framework.Logging": "1.0.0-beta6",
+        "Microsoft.Framework.Logging.Console": "1.0.0-beta6",
         "React.AspNet": "",
         "React.Core": "",
         "JavaScriptEngineSwitcher.V8": "1.2.4.0",