Upgrade to ASP.NET 5 RC1

Daniel15 · Daniel15 · commit 07021aaa5311 · 2015-11-20T21:46:17.000-08:00
diff --git a/appveyor.yml b/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-beta8
+- dnvm install rc1-final
 build:
   project: build.proj
   verbosity: normal
diff --git a/src/React.AspNet/BabelFileMiddleware.cs b/src/React.AspNet/BabelFileMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.StaticFiles;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace React.AspNet
 {
diff --git a/src/React.AspNet/BabelFileSystem.cs b/src/React.AspNet/BabelFileSystem.cs
@@ -17,7 +17,7 @@
 using IOwinFileSystem = Microsoft.Owin.FileSystems.IFileSystem;
 #else
 using Microsoft.AspNet.FileProviders;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using IOwinFileSystem = Microsoft.AspNet.FileProviders.IFileProvider;
 using PhysicalFileSystem = Microsoft.AspNet.FileProviders.PhysicalFileProvider;
 #endif
diff --git a/src/React.AspNet/HtmlHelperExtensions.cs b/src/React.AspNet/HtmlHelperExtensions.cs
@@ -124,7 +124,7 @@ public static IHtmlString ReactWithInit<T>(
 			};
 #else
 			var script = new TagBuilder("script");
-			script.InnerHtml.AppendEncoded(reactComponent.RenderJavaScript());
+			script.InnerHtml.AppendHtml(reactComponent.RenderJavaScript());
 #endif
 			return new HtmlString(html + System.Environment.NewLine + script.ToString());
 		}
@@ -145,7 +145,7 @@ public static IHtmlString ReactInitJavaScript(this IHtmlHelper htmlHelper)
 			return new HtmlString(tag.ToString());
 #else
 			var tag = new TagBuilder("script");
-			tag.InnerHtml.AppendEncoded(script);
+			tag.InnerHtml.AppendHtml(script);
 			return tag;
 #endif
 		}
diff --git a/src/React.AspNet/HttpContextLifetimeProvider.cs b/src/React.AspNet/HttpContextLifetimeProvider.cs
@@ -10,11 +10,10 @@
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
-using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.DependencyInjection;
 using React.Exceptions;
 using React.TinyIoC;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace React.AspNet
 {
diff --git a/src/React.AspNet/ReactBuilderExtensions.cs b/src/React.AspNet/ReactBuilderExtensions.cs
@@ -10,10 +10,10 @@
 using System;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
-using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.PlatformAbstractions;
 using React.Exceptions;
 using React.TinyIoC;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace React.AspNet
 {
diff --git a/src/React.AspNet/ReactServiceCollectionExtensions.cs b/src/React.AspNet/ReactServiceCollectionExtensions.cs
@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace React.AspNet
 {
diff --git a/src/React.AspNet/project.json b/src/React.AspNet/project.json
@@ -14,19 +14,19 @@
             }
         }
     },
-    "dependencies": {
-        "JsPool": "0.3.1",
-        "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",
-        "JavaScriptEngineSwitcher.Msie": "1.2.4",
-        "JavaScriptEngineSwitcher.V8": "1.2.4"
-    },
+  "dependencies": {
+    "JsPool": "0.3.1",
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-rc1-final",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
+    "Microsoft.AspNet.FileProviders.Physical": "1.0.0-rc1-final",
+    "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-rc1-final",
+    "MsieJavaScriptEngine": "1.5.1",
+    "React.Core": "",
+    "JavaScriptEngineSwitcher.Core": "1.2.4.0",
+    "JavaScriptEngineSwitcher.Msie": "1.2.4",
+    "JavaScriptEngineSwitcher.V8": "1.2.4",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final"
+  },
     "frameworks": {
         "dnx451": { }
     },
diff --git a/src/React.Sample.Mvc6/Startup.cs b/src/React.Sample.Mvc6/Startup.cs
@@ -9,10 +9,10 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
-using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.PlatformAbstractions;
 using React.AspNet;
 
 namespace React.Sample.Mvc6
diff --git a/src/React.Sample.Mvc6/project.json b/src/React.Sample.Mvc6/project.json
@@ -1,21 +1,21 @@
 {
     "webroot": "wwwroot",
     "version": "2.1.1-*",
-    "dependencies": {
-        "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"
-    },
+  "dependencies": {
+    "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
+    "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
+    "React.AspNet": "",
+    "React.Core": "",
+    "JavaScriptEngineSwitcher.V8": "1.2.4.0",
+    "JavaScriptEngineSwitcher.Msie": "1.2.4.0"
+  },
     "commands": {
       "web": "Microsoft.AspNet.Server.Kestrel",
         "gen": "Microsoft.Framework.CodeGeneration"
diff --git a/src/global.json b/src/global.json
@@ -3,7 +3,7 @@
     "wrap"
   ],
   "sdk": {
-    "version": "1.0.0-beta8"
+    "version": "1.0.0-rc1-final"
   },
   "projects": [
     "wrap"
diff --git a/src/wrap/React.Core/project.json b/src/wrap/React.Core/project.json
@@ -14,7 +14,7 @@
         "JSPool": "0.3.1",
         "MsieJavaScriptEngine": "1.5.1",
         "Newtonsoft.Json": "6.0.8",
-        "VroomJs": "2.1.0-*"
+        "VroomJs": "2.1.1-*"
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`using Microsoft.AspNet.Hosting;`
`15`	`15`	`using Microsoft.AspNet.Http;`
`16`	`16`	`using Microsoft.AspNet.StaticFiles;`
`17`		`-using Microsoft.Framework.Logging;`
	`17`	`+using Microsoft.Extensions.Logging;`
`18`	`18`
`19`	`19`	`namespace React.AspNet`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* of patent rights can be found in the PATENTS file in the same directory.`
`8`	`8`	`*/`
`9`	`9`
`10`		`-using Microsoft.Framework.DependencyInjection;`
	`10`	`+using Microsoft.Extensions.DependencyInjection;`
`11`	`11`
`12`	`12`	`namespace React.AspNet`
`13`	`13`	`{`