Upgrade to ASP.NET 5 Beta 8. #171

Author: Daniel15

appveyor.yml

@@ -3,7 +3,7 @@ os: Visual Studio 2015
 install:
 - set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%
 - dnvm update-self
-- dnvm install 1.0.0-beta7
+- dnvm install 1.0.0-beta8
 build:
   project: build.proj
   verbosity: normal

src/React.AspNet/BabelFileSystem.cs

@@ -17,7 +17,7 @@
 using IOwinFileSystem = Microsoft.Owin.FileSystems.IFileSystem;
 #else
 using Microsoft.AspNet.FileProviders;
-using Microsoft.Framework.Caching;
+using Microsoft.Framework.Primitives;
 using IOwinFileSystem = Microsoft.AspNet.FileProviders.IFileProvider;
 using PhysicalFileSystem = Microsoft.AspNet.FileProviders.PhysicalFileProvider;
 #endif
@@ -129,21 +129,23 @@ public IDirectoryContents GetDirectoryContents(string subpath)
 		}
 
 		/// <summary>
-		/// Creates a change trigger with the specified filter.
+		/// Creates a <see cref="T:Microsoft.Framework.Primitives.IChangeToken"/> for the 
+		/// specified <paramref name="filter"/>.
 		/// </summary>
 		/// <param name="filter">
-		/// Filter string used to determine what files or folders to monitor. Example: **/*.cs, *.*, subFolder/**/*.cshtml.
-		/// </param>
+		/// Filter string used to determine what files or folders to monitor. 
+		/// Example: **/*.cs, *.*, subFolder/**/*.cshtml.</param>
 		/// <returns>
-		/// An <see cref="IExpirationTrigger"/> that is triggered when a file matching <paramref name="filter"/> is added, modified or deleted.
+		/// An <see cref="T:Microsoft.Framework.Primitives.IChangeToken"/> that is notified
+		/// when a file matching <paramref name="filter"/> is added, modified or deleted.
 		/// </returns>
-		IExpirationTrigger IOwinFileSystem.Watch(string filter)
+		public IChangeToken Watch(string filter)
 		{
 			return _physicalFileSystem.Watch(filter);
 		}
 #endif
 
-        	private class BabelFileInfo : IFileInfo
+		private class BabelFileInfo : IFileInfo
 		{
 			private readonly IBabel _babel;
 			private readonly IFileInfo _fileInfo;

src/React.AspNet/HtmlHelperExtensions.cs

@@ -116,14 +116,16 @@ public static IHtmlString ReactWithInit<T>(
 				reactComponent.ContainerTag = htmlTag;
 			}
 			var html = reactComponent.RenderHtml(clientOnly);
+
+#if LEGACYASPNET
 			var script = new TagBuilder("script")
 			{
-#if LEGACYASPNET
 				InnerHtml = reactComponent.RenderJavaScript()
+			};
 #else
-				InnerHtml = new HtmlString(reactComponent.RenderJavaScript())
+			var script = new TagBuilder("script");
+			script.InnerHtml.AppendEncoded(reactComponent.RenderJavaScript());
 #endif
-			};
 			return new HtmlString(html + System.Environment.NewLine + script.ToString());
 		}
 
@@ -142,10 +144,8 @@ public static IHtmlString ReactInitJavaScript(this IHtmlHelper htmlHelper)
 			};
 			return new HtmlString(tag.ToString());
 #else
-			var tag = new TagBuilder("script")
-			{
-				InnerHtml = new HtmlString(script)
-			};
+			var tag = new TagBuilder("script");
+			tag.InnerHtml.AppendEncoded(script);
 			return tag;
 #endif
 		}

src/React.AspNet/project.json

@@ -16,11 +16,11 @@
     },
     "dependencies": {
         "JsPool": "0.3.0",
-        "Microsoft.Framework.DependencyInjection": "1.0.0-beta7",
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-beta7",
-        "Microsoft.AspNet.StaticFiles": "1.0.0-beta7",
-        "Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta7",
-        "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-beta7",
+        "Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
+        "Microsoft.AspNet.Mvc.Core": "6.0.0-beta8",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-beta8",
+        "Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta8",
+        "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-beta8",
         "MsieJavaScriptEngine": "1.5.1",
         "React.Core": "",
         "JavaScriptEngineSwitcher.Core": "1.2.4.0",

src/React.Sample.Mvc6/Startup.cs

@@ -22,8 +22,7 @@ public class Startup
 		public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
 		{
             // Setup configuration sources.
-            var builder = new ConfigurationBuilder(appEnv.ApplicationBasePath)
-                                .AddEnvironmentVariables();
+            var builder = new ConfigurationBuilder().AddEnvironmentVariables();
 
             Configuration = builder.Build();
 		}
@@ -44,20 +43,23 @@ public void ConfigureServices(IServiceCollection services)
 		public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerfactory)
 		{
 			// Configure the HTTP request pipeline.
+			// Add the platform handler to the request pipeline.
+			app.UseIISPlatformHandler();
+
 			// Add the console logger.
 			loggerfactory.AddConsole();
 
 			// Add the following to the request pipeline only in development environment.
 			if (env.IsDevelopment())
 			{
 				//app.UseBrowserLink();
-				app.UseErrorPage();
+				app.UseDeveloperExceptionPage();
 			}
 			else
 			{
 				// Add Error handling middleware which catches all application specific errors and
 				// send the request to the following path or controller action.
-				app.UseErrorHandler("/Home/Error");
+				app.UseExceptionHandler("/Home/Error");
 			}
 
 			// Initialise ReactJS.NET. Must be before static files.

src/React.Sample.Mvc6/project.json

@@ -2,22 +2,22 @@
     "webroot": "wwwroot",
     "version": "2.0.0-*",
     "dependencies": {
-        "Microsoft.AspNet.Mvc": "6.0.0-beta7",
-      "Microsoft.AspNet.Diagnostics": "1.0.0-beta7",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-beta7",
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-beta7",
-        "Microsoft.AspNet.StaticFiles": "1.0.0-beta7",
-        "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-beta7",
-        "Microsoft.Framework.Configuration.Json": "1.0.0-beta7", 
-        "Microsoft.Framework.Logging": "1.0.0-beta7",
-        "Microsoft.Framework.Logging.Console": "1.0.0-beta7",
+        "Microsoft.AspNet.Mvc": "6.0.0-beta8",
+        "Microsoft.AspNet.Diagnostics": "1.0.0-beta8",
+        "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8",
+        "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
+        "Microsoft.AspNet.StaticFiles": "1.0.0-beta8",
+        "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-beta8",
+        "Microsoft.Framework.Configuration.Json": "1.0.0-beta8", 
+        "Microsoft.Framework.Logging": "1.0.0-beta8",
+        "Microsoft.Framework.Logging.Console": "1.0.0-beta8",
         "React.AspNet": "",
         "React.Core": "",
         "JavaScriptEngineSwitcher.V8": "1.2.4.0",
         "JavaScriptEngineSwitcher.Msie": "1.2.4.0"
     },
     "commands": {
-        "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000",
+      "web": "Microsoft.AspNet.Server.Kestrel",
         "gen": "Microsoft.Framework.CodeGeneration"
     },
     "frameworks": {

src/React.Sample.Mvc6/wwwroot/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
+  </system.webServer>
+</configuration>

src/global.json

@@ -3,7 +3,7 @@
     "wrap"
   ],
   "sdk": {
-    "version": "1.0.0-beta7"
+    "version": "1.0.0-beta8"
   },
   "projects": [
     "wrap"