RC1 - ASP.NET

Author: christiannagel

ASPNET/WebSampleApp/global.json

@@ -1,4 +1,6 @@
 {
-  "projects": [ "src", "test" ]
-
+  "projects": [ "src", "test" ],
+  "sdk": {
+    "version": "1.0.0-rc1-update1"
+  }
 }

ASPNET/WebSampleApp/src/WebSampleApp/ConfigSample.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Http;
 using Microsoft.Extensions.Configuration;
 using System.Threading.Tasks;
 

ASPNET/WebSampleApp/src/WebSampleApp/Controllers/HomeController.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Http;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;

ASPNET/WebSampleApp/src/WebSampleApp/Middleware/HeaderMiddleware.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Http;
 using System.Threading.Tasks;
 
 namespace WebSampleApp.Middleware

ASPNET/WebSampleApp/src/WebSampleApp/Middleware/Heading1Middleware.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Http;
 using System.Threading.Tasks;
 
 namespace WebSampleApp.Middleware

ASPNET/WebSampleApp/src/WebSampleApp/Properties/launchSettings.json

@@ -17,7 +17,6 @@
     },
     "web": {
       "commandName": "web",
-      "commandLineArgs": "Environment=Development",
       "launchBrowser": true,
       "launchUrl": "http://localhost:5000/",
       "environmentVariables": {

ASPNET/WebSampleApp/src/WebSampleApp/RequestAndResponseSample.cs

@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Http;
 using Newtonsoft.Json;
 using System;
 using System.Text;
-using System.Text.Encodings.Web;
+using Microsoft.Extensions.WebEncoders;
 
 namespace WebSampleApp
 {
@@ -64,7 +64,7 @@ public static string QueryString(HttpRequest request)
         public static string Content(HttpRequest request) => request.Query["data"];
 
         public static string ContentEncoded(HttpRequest request) =>
-            HtmlEncoder.Default.Encode(request.Query["data"]);
+            HtmlEncoder.Default.HtmlEncode(request.Query["data"]);
 
         public static string GetForm(HttpRequest request)
         {
@@ -98,7 +98,7 @@ private static string ShowForm(HttpRequest request)
                 IFormCollection coll = request.Form;
                 foreach (var key in coll.Keys)
                 {
-                    sb.Append(GetDiv(key, HtmlEncoder.Default.Encode(coll[key])));
+                    sb.Append(GetDiv(key, HtmlEncoder.Default.HtmlEncode(coll[key])));
                 }
                 return sb.ToString();
             }
@@ -119,7 +119,7 @@ public static string WriteCookie(HttpResponse response)
         public static string ReadCookie(HttpRequest request)
         {
             var sb = new StringBuilder();
-            IRequestCookieCollection cookies = request.Cookies;
+            IReadableStringCollection cookies = request.Cookies;
             foreach (var key in cookies.Keys)
             {
                 sb.Append(GetDiv(key, cookies[key]));

ASPNET/WebSampleApp/src/WebSampleApp/SessionSample.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Http;
 using System;
 using System.Globalization;
 using System.Threading.Tasks;

ASPNET/WebSampleApp/src/WebSampleApp/Startup.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.PlatformAbstractions;
@@ -9,7 +9,7 @@
 using WebSampleApp.Middleware;
 using WebSampleApp.Services;
 using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNet.Hosting.Internal;
 
 namespace WebSampleApp
 {
@@ -190,14 +190,6 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         }
 
         // Entry point for the application.
-        public static void Main(string[] args)
-        {
-            var host = new WebHostBuilder()
-                .UseDefaultConfiguration(args)
-                .UseStartup<Startup>()
-                .Build();
-
-            host.Run();
-        }
+        public static void Main(string[] args) => WebApplication.Run<Startup>(args);
     }
 }

ASPNET/WebSampleApp/src/WebSampleApp/hosting.json

@@ -1,4 +1,4 @@
 {
-  "server": "Microsoft.AspNetCore.Server.Kestrel",
+  "server": "Microsoft.AspNet.Server.Kestrel",
   "server.urls": "http://localhost:5000"
 }