github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update everything to use ASP.NET 5 RC1

Browse Source
This commit is contained in:
SteveSandersonMS
2015-11-24 12:06:24 +00:00
parent efe51c0c95
commit 83c9f2136d
15 changed files with 76 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs
View File

@@ -1,10 +1,10 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Extensions; using Microsoft.AspNet.Http.Extensions;
using Microsoft.AspNet.NodeServices; using Microsoft.AspNet.NodeServices;
using Microsoft.Dnx.Runtime; using Microsoft.AspNet.Razor.TagHelpers;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.AngularServices namespace Microsoft.AspNet.AngularServices
{ {
@@ -48,7 +48,7 @@ namespace Microsoft.AspNet.AngularServices
requestUrl: UriHelper.GetEncodedUrl(this.contextAccessor.HttpContext.Request) requestUrl: UriHelper.GetEncodedUrl(this.contextAccessor.HttpContext.Request)
); );
output.SuppressOutput(); output.SuppressOutput();
output.PostElement.AppendEncoded(result); output.PostElement.AppendHtml(result);
} }
} }
} }

3
Microsoft.AspNet.AngularServices/project.json
View File

@@ -26,8 +26,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7", "Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*"
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8"
}, },
"resource": [ "resource": [
"Content/**/*" "Content/**/*"

4
Microsoft.AspNet.NodeServices/Configuration.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.Dnx.Runtime; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Framework.DependencyInjection; using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.NodeServices { namespace Microsoft.AspNet.NodeServices {
public static class Configuration { public static class Configuration {

25
Microsoft.AspNet.NodeServices/project.json
View File

@@ -10,24 +10,23 @@
"projectUrl": "", "projectUrl": "",
"licenseUrl": "", "licenseUrl": "",
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.1-beta-23409", "System.Net.Http": "4.0.1-beta-*",
"Newtonsoft.Json": "8.0.1-beta1", "Newtonsoft.Json": "8.0.1-beta3",
"Microsoft.Framework.DependencyInjection": "1.0.0-beta8", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8" "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final"
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23217", "Microsoft.CSharp": "4.0.1-beta-*",
"System.Collections": "4.0.11-beta-23217", "System.Collections": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-23217", "System.Linq": "4.0.1-beta-*",
"System.Runtime": "4.0.21-beta-23217", "System.Threading": "4.0.11-beta-*",
"System.Threading": "4.0.11-beta-23217", "System.Text.RegularExpressions": "4.0.11-beta-*",
"System.Text.RegularExpressions": "4.0.11-beta-23409", "System.Diagnostics.Process": "4.1.0-beta-*",
"System.Diagnostics.Process": "4.1.0-beta-23409", "System.IO.FileSystem": "4.0.1-beta-*",
"System.IO.FileSystem": "4.0.1-beta-23409", "System.Console": "4.0.0-beta-*"
"System.Console": "4.0.0-beta-23409"
} }
} }
}, },

6
Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs
View File

@@ -1,9 +1,9 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.NodeServices; using Microsoft.AspNet.NodeServices;
using Microsoft.Dnx.Runtime; using Microsoft.AspNet.Razor.TagHelpers;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.ReactServices namespace Microsoft.AspNet.ReactServices
{ {
@@ -45,7 +45,7 @@ namespace Microsoft.AspNet.ReactServices
componentModuleName: this.ModuleName, componentModuleName: this.ModuleName,
componentExportName: this.ExportName, componentExportName: this.ExportName,
requestUrl: request.Path + request.QueryString.Value); requestUrl: request.Path + request.QueryString.Value);
output.Content.SetContentEncoded(result); output.Content.SetHtmlContent(result);
} }
} }
} }

3
Microsoft.AspNet.ReactServices/project.json
View File

@@ -26,8 +26,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7", "Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*"
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8"
}, },
"resource": [ "resource": [
"Content/**/*" "Content/**/*"

5
global.json
View File

@@ -1,3 +1,6 @@
{ {
"projects": ["."] "projects": ["."],
"sdk": {
"version": "1.0.0-rc1-final"
}
} }

7
samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs
View File

@@ -1,10 +1,5 @@
using System; using Microsoft.AspNet.Identity.EntityFramework;
using System.Linq;
using Microsoft.AspNet.Identity;
using Microsoft.AspNet.Identity.EntityFramework;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Framework.OptionsModel;
namespace MusicStore.Models namespace MusicStore.Models
{ {

7
samples/angular/MusicStore/Apis/Models/SampleData.cs
View File

@@ -6,11 +6,8 @@ using System.Threading.Tasks;
using Microsoft.AspNet.Identity; using Microsoft.AspNet.Identity;
using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.AspNet.Identity.EntityFramework;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Storage; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Framework.DependencyInjection; using Microsoft.Extensions.OptionsModel;
using Microsoft.Framework.OptionsModel;
using MusicStore;
using MusicStore.Models;
namespace MusicStore.Models namespace MusicStore.Models
{ {

17
samples/angular/MusicStore/Startup.cs
View File

@@ -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.Authorization;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.AspNet.Identity.EntityFramework;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Microsoft.Dnx.Runtime; using Microsoft.Extensions.Configuration;
using Microsoft.Framework.Configuration; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Framework.DependencyInjection; using Microsoft.Extensions.Logging;
using Microsoft.Framework.Logging; using Microsoft.Extensions.PlatformAbstractions;
using AutoMapper;
using MusicStore.Apis; using MusicStore.Apis;
using MusicStore.Models; using MusicStore.Models;
@@ -86,7 +81,7 @@ namespace MusicStore
// Initialize the sample data // Initialize the sample data
SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait(); SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
loggerFactory.MinimumLevel = LogLevel.Information; loggerFactory.MinimumLevel = LogLevel.Warning;
loggerFactory.AddConsole(); loggerFactory.AddConsole();
loggerFactory.AddDebug(); loggerFactory.AddDebug();

28
samples/angular/MusicStore/project.json
View File

@@ -5,21 +5,19 @@
"defaultNamespace": "MusicStore" "defaultNamespace": "MusicStore"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-beta8", "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*",
"Microsoft.AspNet.Mvc": "6.0.0-beta8", "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta8", "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
"Microsoft.AspNet.Tooling.Razor": "1.0.0-beta8", "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8", "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*",
"Microsoft.Framework.Logging": "1.0.0-beta8", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*",
"Microsoft.Framework.Logging.Console": "1.0.0-beta8", "EntityFramework.SQLite": "7.0.0-rc1-*",
"Microsoft.Framework.Logging.Debug": "1.0.0-beta8", "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"EntityFramework.SQLite": "7.0.0-beta8", "Microsoft.AspNet.AngularServices": "1.0.0-alpha7",
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8", "AutoMapper": "4.1.1"
"AutoMapper": "4.0.0-alpha1",
"Microsoft.AspNet.AngularServices": "1.0.0-alpha7"
}, },
"commands": { "commands": {
"web": "Microsoft.AspNet.Server.Kestrel" "web": "Microsoft.AspNet.Server.Kestrel"

10
samples/misc/ES2015Transpilation/Startup.cs
View File

@@ -1,11 +1,11 @@
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting; 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.NodeServices;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
namespace ES2015Example namespace ES2015Example
{ {
@@ -36,7 +36,7 @@ namespace ES2015Example
// Configure is called after ConfigureServices is called. // Configure is called after ConfigureServices is called.
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, INodeServices nodeServices) public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, INodeServices nodeServices)
{ {
loggerFactory.MinimumLevel = LogLevel.Information; loggerFactory.MinimumLevel = LogLevel.Warning;
loggerFactory.AddConsole(); loggerFactory.AddConsole();
loggerFactory.AddDebug(); loggerFactory.AddDebug();

20
samples/misc/ES2015Transpilation/project.json
View File

@@ -5,17 +5,15 @@
"defaultNamespace": "ES2015Example" "defaultNamespace": "ES2015Example"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-beta8", "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*",
"Microsoft.AspNet.Mvc": "6.0.0-beta8", "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta8", "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
"Microsoft.AspNet.Tooling.Razor": "1.0.0-beta8", "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8", "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*",
"Microsoft.Framework.Logging": "1.0.0-beta8", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*",
"Microsoft.Framework.Logging.Console": "1.0.0-beta8",
"Microsoft.Framework.Logging.Debug": "1.0.0-beta8",
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7" "Microsoft.AspNet.NodeServices": "1.0.0-alpha7"
}, },
"commands": { "commands": {

11
samples/react/ReactGrid/Startup.cs
View File

@@ -1,10 +1,9 @@
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.NodeServices; using Microsoft.Extensions.Configuration;
using Microsoft.Dnx.Runtime; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Framework.Configuration; using Microsoft.Extensions.Logging;
using Microsoft.Framework.DependencyInjection; using Microsoft.Extensions.PlatformAbstractions;
using Microsoft.Framework.Logging;
namespace ReactExample namespace ReactExample
{ {
@@ -32,7 +31,7 @@ namespace ReactExample
// Configure is called after ConfigureServices is called. // Configure is called after ConfigureServices is called.
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
{ {
loggerFactory.MinimumLevel = LogLevel.Information; loggerFactory.MinimumLevel = LogLevel.Warning;
loggerFactory.AddConsole(); loggerFactory.AddConsole();
loggerFactory.AddDebug(); loggerFactory.AddDebug();

20
samples/react/ReactGrid/project.json
View File

@@ -5,17 +5,15 @@
"defaultNamespace": "ReactExample" "defaultNamespace": "ReactExample"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Diagnostics": "1.0.0-beta8", "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*",
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*",
"Microsoft.AspNet.Mvc": "6.0.0-beta8", "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-beta8", "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
"Microsoft.AspNet.Tooling.Razor": "1.0.0-beta8", "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8", "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*",
"Microsoft.Framework.Logging": "1.0.0-beta8", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*",
"Microsoft.Framework.Logging.Console": "1.0.0-beta8",
"Microsoft.Framework.Logging.Debug": "1.0.0-beta8",
"Microsoft.AspNet.ReactServices": "1.0.0-alpha7" "Microsoft.AspNet.ReactServices": "1.0.0-alpha7"
}, },
"commands": { "commands": {