From 83c9f2136d1c9125f4841afdaca13c328183f965 Mon Sep 17 00:00:00 2001 From: SteveSandersonMS Date: Tue, 24 Nov 2015 12:06:24 +0000 Subject: [PATCH] Update everything to use ASP.NET 5 RC1 --- .../AngularPrerenderTagHelper.cs | 6 ++-- Microsoft.AspNet.AngularServices/project.json | 3 +- .../Configuration.cs | 4 +-- Microsoft.AspNet.NodeServices/project.json | 25 ++++++++--------- .../ReactPrerenderTagHelper.cs | 6 ++-- Microsoft.AspNet.ReactServices/project.json | 3 +- global.json | 5 +++- .../Apis/Models/MusicStoreContext.cs | 7 +---- .../MusicStore/Apis/Models/SampleData.cs | 7 ++--- samples/angular/MusicStore/Startup.cs | 17 ++++------- samples/angular/MusicStore/project.json | 28 +++++++++---------- samples/misc/ES2015Transpilation/Startup.cs | 10 +++---- samples/misc/ES2015Transpilation/project.json | 20 ++++++------- samples/react/ReactGrid/Startup.cs | 11 ++++---- samples/react/ReactGrid/project.json | 20 ++++++------- 15 files changed, 76 insertions(+), 96 deletions(-) diff --git a/Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs b/Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs index bacb3dc..b5771cc 100644 --- a/Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs +++ b/Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs @@ -1,10 +1,10 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.NodeServices; -using Microsoft.Dnx.Runtime; +using Microsoft.AspNet.Razor.TagHelpers; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.AngularServices { @@ -48,7 +48,7 @@ namespace Microsoft.AspNet.AngularServices requestUrl: UriHelper.GetEncodedUrl(this.contextAccessor.HttpContext.Request) ); output.SuppressOutput(); - output.PostElement.AppendEncoded(result); + output.PostElement.AppendHtml(result); } } } diff --git a/Microsoft.AspNet.AngularServices/project.json b/Microsoft.AspNet.AngularServices/project.json index 36060d1..41c8f1a 100644 --- a/Microsoft.AspNet.AngularServices/project.json +++ b/Microsoft.AspNet.AngularServices/project.json @@ -26,8 +26,7 @@ }, "dependencies": { "Microsoft.AspNet.NodeServices": "1.0.0-alpha7", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", - "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8" + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*" }, "resource": [ "Content/**/*" diff --git a/Microsoft.AspNet.NodeServices/Configuration.cs b/Microsoft.AspNet.NodeServices/Configuration.cs index 7a21663..043cc2d 100644 --- a/Microsoft.AspNet.NodeServices/Configuration.cs +++ b/Microsoft.AspNet.NodeServices/Configuration.cs @@ -1,5 +1,5 @@ -using Microsoft.Dnx.Runtime; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.NodeServices { public static class Configuration { diff --git a/Microsoft.AspNet.NodeServices/project.json b/Microsoft.AspNet.NodeServices/project.json index b8da71a..f278161 100644 --- a/Microsoft.AspNet.NodeServices/project.json +++ b/Microsoft.AspNet.NodeServices/project.json @@ -10,24 +10,23 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "System.Net.Http": "4.0.1-beta-23409", - "Newtonsoft.Json": "8.0.1-beta1", - "Microsoft.Framework.DependencyInjection": "1.0.0-beta8", - "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8" + "System.Net.Http": "4.0.1-beta-*", + "Newtonsoft.Json": "8.0.1-beta3", + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final" }, "frameworks": { "dnx451": {}, "dnxcore50": { "dependencies": { - "Microsoft.CSharp": "4.0.1-beta-23217", - "System.Collections": "4.0.11-beta-23217", - "System.Linq": "4.0.1-beta-23217", - "System.Runtime": "4.0.21-beta-23217", - "System.Threading": "4.0.11-beta-23217", - "System.Text.RegularExpressions": "4.0.11-beta-23409", - "System.Diagnostics.Process": "4.1.0-beta-23409", - "System.IO.FileSystem": "4.0.1-beta-23409", - "System.Console": "4.0.0-beta-23409" + "Microsoft.CSharp": "4.0.1-beta-*", + "System.Collections": "4.0.11-beta-*", + "System.Linq": "4.0.1-beta-*", + "System.Threading": "4.0.11-beta-*", + "System.Text.RegularExpressions": "4.0.11-beta-*", + "System.Diagnostics.Process": "4.1.0-beta-*", + "System.IO.FileSystem": "4.0.1-beta-*", + "System.Console": "4.0.0-beta-*" } } }, diff --git a/Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs b/Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs index 2419403..6d2b761 100644 --- a/Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs +++ b/Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs @@ -1,9 +1,9 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Http; using Microsoft.AspNet.NodeServices; -using Microsoft.Dnx.Runtime; +using Microsoft.AspNet.Razor.TagHelpers; +using Microsoft.Extensions.PlatformAbstractions; namespace Microsoft.AspNet.ReactServices { @@ -45,7 +45,7 @@ namespace Microsoft.AspNet.ReactServices componentModuleName: this.ModuleName, componentExportName: this.ExportName, requestUrl: request.Path + request.QueryString.Value); - output.Content.SetContentEncoded(result); + output.Content.SetHtmlContent(result); } } } diff --git a/Microsoft.AspNet.ReactServices/project.json b/Microsoft.AspNet.ReactServices/project.json index 37929e4..c6904f2 100644 --- a/Microsoft.AspNet.ReactServices/project.json +++ b/Microsoft.AspNet.ReactServices/project.json @@ -26,8 +26,7 @@ }, "dependencies": { "Microsoft.AspNet.NodeServices": "1.0.0-alpha7", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", - "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8" + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*" }, "resource": [ "Content/**/*" diff --git a/global.json b/global.json index 6a7d89b..9c71b05 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { - "projects": ["."] + "projects": ["."], + "sdk": { + "version": "1.0.0-rc1-final" + } } diff --git a/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs b/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs index d63ff69..ffecfc5 100644 --- a/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs +++ b/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs @@ -1,10 +1,5 @@ -using System; -using System.Linq; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Framework.OptionsModel; namespace MusicStore.Models { diff --git a/samples/angular/MusicStore/Apis/Models/SampleData.cs b/samples/angular/MusicStore/Apis/Models/SampleData.cs index 25e2a5c..c6e86d3 100644 --- a/samples/angular/MusicStore/Apis/Models/SampleData.cs +++ b/samples/angular/MusicStore/Apis/Models/SampleData.cs @@ -6,11 +6,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Storage; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.OptionsModel; -using MusicStore; -using MusicStore.Models; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.OptionsModel; namespace MusicStore.Models { diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs index 81a5279..7e4d714 100755 --- a/samples/angular/MusicStore/Startup.cs +++ b/samples/angular/MusicStore/Startup.cs @@ -1,18 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using AutoMapper; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; -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 AutoMapper; using MusicStore.Apis; using MusicStore.Models; @@ -86,7 +81,7 @@ namespace MusicStore // Initialize the sample data SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait(); - loggerFactory.MinimumLevel = LogLevel.Information; + loggerFactory.MinimumLevel = LogLevel.Warning; loggerFactory.AddConsole(); loggerFactory.AddDebug(); diff --git a/samples/angular/MusicStore/project.json b/samples/angular/MusicStore/project.json index db764ce..c303a1f 100755 --- a/samples/angular/MusicStore/project.json +++ b/samples/angular/MusicStore/project.json @@ -5,21 +5,19 @@ "defaultNamespace": "MusicStore" }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", - "Microsoft.AspNet.Mvc": "6.0.0-beta8", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", - "Microsoft.AspNet.StaticFiles": "1.0.0-beta8", - "Microsoft.AspNet.Tooling.Razor": "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", - "Microsoft.Framework.Logging.Debug": "1.0.0-beta8", - "EntityFramework.SQLite": "7.0.0-beta8", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8", - "AutoMapper": "4.0.0-alpha1", - "Microsoft.AspNet.AngularServices": "1.0.0-alpha7" + "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*", + "Microsoft.AspNet.Mvc": "6.0.0-rc1-*", + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*", + "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*", + "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*", + "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*", + "EntityFramework.SQLite": "7.0.0-rc1-*", + "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", + "Microsoft.AspNet.AngularServices": "1.0.0-alpha7", + "AutoMapper": "4.1.1" }, "commands": { "web": "Microsoft.AspNet.Server.Kestrel" diff --git a/samples/misc/ES2015Transpilation/Startup.cs b/samples/misc/ES2015Transpilation/Startup.cs index 80e7e5f..376cadb 100755 --- a/samples/misc/ES2015Transpilation/Startup.cs +++ b/samples/misc/ES2015Transpilation/Startup.cs @@ -1,11 +1,11 @@ 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.AspNet.NodeServices; using Microsoft.AspNet.Http; +using Microsoft.Extensions.PlatformAbstractions; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; namespace ES2015Example { @@ -36,7 +36,7 @@ namespace ES2015Example // Configure is called after ConfigureServices is called. public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, INodeServices nodeServices) { - loggerFactory.MinimumLevel = LogLevel.Information; + loggerFactory.MinimumLevel = LogLevel.Warning; loggerFactory.AddConsole(); loggerFactory.AddDebug(); diff --git a/samples/misc/ES2015Transpilation/project.json b/samples/misc/ES2015Transpilation/project.json index 1176979..fcf2aa4 100755 --- a/samples/misc/ES2015Transpilation/project.json +++ b/samples/misc/ES2015Transpilation/project.json @@ -5,17 +5,15 @@ "defaultNamespace": "ES2015Example" }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", - "Microsoft.AspNet.Mvc": "6.0.0-beta8", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", - "Microsoft.AspNet.StaticFiles": "1.0.0-beta8", - "Microsoft.AspNet.Tooling.Razor": "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", - "Microsoft.Framework.Logging.Debug": "1.0.0-beta8", + "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*", + "Microsoft.AspNet.Mvc": "6.0.0-rc1-*", + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*", + "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*", + "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*", + "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*", "Microsoft.AspNet.NodeServices": "1.0.0-alpha7" }, "commands": { diff --git a/samples/react/ReactGrid/Startup.cs b/samples/react/ReactGrid/Startup.cs index 48ccde8..0279cf6 100755 --- a/samples/react/ReactGrid/Startup.cs +++ b/samples/react/ReactGrid/Startup.cs @@ -1,10 +1,9 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.NodeServices; -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; namespace ReactExample { @@ -32,7 +31,7 @@ namespace ReactExample // Configure is called after ConfigureServices is called. public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { - loggerFactory.MinimumLevel = LogLevel.Information; + loggerFactory.MinimumLevel = LogLevel.Warning; loggerFactory.AddConsole(); loggerFactory.AddDebug(); diff --git a/samples/react/ReactGrid/project.json b/samples/react/ReactGrid/project.json index 167a3a0..87370b9 100755 --- a/samples/react/ReactGrid/project.json +++ b/samples/react/ReactGrid/project.json @@ -5,17 +5,15 @@ "defaultNamespace": "ReactExample" }, "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", - "Microsoft.AspNet.Mvc": "6.0.0-beta8", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", - "Microsoft.AspNet.StaticFiles": "1.0.0-beta8", - "Microsoft.AspNet.Tooling.Razor": "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", - "Microsoft.Framework.Logging.Debug": "1.0.0-beta8", + "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*", + "Microsoft.AspNet.Mvc": "6.0.0-rc1-*", + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*", + "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*", + "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*", + "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*", "Microsoft.AspNet.ReactServices": "1.0.0-alpha7" }, "commands": {