Skip to content

Commit 83c9f21

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update everything to use ASP.NET 5 RC1
1 parent efe51c0 commit 83c9f21

File tree

15 files changed

+76
-96
lines changed

15 files changed

+76
-96
lines changed

‎Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Threading.Tasks;
3-
using Microsoft.AspNet.Razor.Runtime.TagHelpers;
43
using Microsoft.AspNet.Http;
54
using Microsoft.AspNet.Http.Extensions;
65
using Microsoft.AspNet.NodeServices;
7-
using Microsoft.Dnx.Runtime;
6+
using Microsoft.AspNet.Razor.TagHelpers;
7+
using Microsoft.Extensions.PlatformAbstractions;
88

99
namespace Microsoft.AspNet.AngularServices
1010
{
@@ -48,7 +48,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
4848
requestUrl: UriHelper.GetEncodedUrl(this.contextAccessor.HttpContext.Request)
4949
);
5050
output.SuppressOutput();
51-
output.PostElement.AppendEncoded(result);
51+
output.PostElement.AppendHtml(result);
5252
}
5353
}
5454
}

‎Microsoft.AspNet.AngularServices/project.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
},
2727
"dependencies": {
2828
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
29-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8",
30-
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8"
29+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*"
3130
},
3231
"resource": [
3332
"Content/**/*"

‎Microsoft.AspNet.NodeServices/Configuration.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Microsoft.Dnx.Runtime;
2-
using Microsoft.Framework.DependencyInjection;
1+
using Microsoft.Extensions.DependencyInjection;
2+
using Microsoft.Extensions.PlatformAbstractions;
33

44
namespace Microsoft.AspNet.NodeServices {
55
public static class Configuration {

‎Microsoft.AspNet.NodeServices/project.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,23 @@
1010
"projectUrl": "",
1111
"licenseUrl": "",
1212
"dependencies": {
13-
"System.Net.Http": "4.0.1-beta-23409",
14-
"Newtonsoft.Json": "8.0.1-beta1",
15-
"Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
16-
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8"
13+
"System.Net.Http": "4.0.1-beta-*",
14+
"Newtonsoft.Json": "8.0.1-beta3",
15+
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
16+
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final"
1717
},
1818
"frameworks": {
1919
"dnx451": {},
2020
"dnxcore50": {
2121
"dependencies": {
22-
"Microsoft.CSharp": "4.0.1-beta-23217",
23-
"System.Collections": "4.0.11-beta-23217",
24-
"System.Linq": "4.0.1-beta-23217",
25-
"System.Runtime": "4.0.21-beta-23217",
26-
"System.Threading": "4.0.11-beta-23217",
27-
"System.Text.RegularExpressions": "4.0.11-beta-23409",
28-
"System.Diagnostics.Process": "4.1.0-beta-23409",
29-
"System.IO.FileSystem": "4.0.1-beta-23409",
30-
"System.Console": "4.0.0-beta-23409"
22+
"Microsoft.CSharp": "4.0.1-beta-*",
23+
"System.Collections": "4.0.11-beta-*",
24+
"System.Linq": "4.0.1-beta-*",
25+
"System.Threading": "4.0.11-beta-*",
26+
"System.Text.RegularExpressions": "4.0.11-beta-*",
27+
"System.Diagnostics.Process": "4.1.0-beta-*",
28+
"System.IO.FileSystem": "4.0.1-beta-*",
29+
"System.Console": "4.0.0-beta-*"
3130
}
3231
}
3332
},

‎Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Threading.Tasks;
3-
using Microsoft.AspNet.Razor.Runtime.TagHelpers;
43
using Microsoft.AspNet.Http;
54
using Microsoft.AspNet.NodeServices;
6-
using Microsoft.Dnx.Runtime;
5+
using Microsoft.AspNet.Razor.TagHelpers;
6+
using Microsoft.Extensions.PlatformAbstractions;
77

88
namespace Microsoft.AspNet.ReactServices
99
{
@@ -45,7 +45,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
4545
componentModuleName: this.ModuleName,
4646
componentExportName: this.ExportName,
4747
requestUrl: request.Path + request.QueryString.Value);
48-
output.Content.SetContentEncoded(result);
48+
output.Content.SetHtmlContent(result);
4949
}
5050
}
5151
}

‎Microsoft.AspNet.ReactServices/project.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
},
2727
"dependencies": {
2828
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
29-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8",
30-
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8"
29+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*"
3130
},
3231
"resource": [
3332
"Content/**/*"

‎global.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"projects": ["."]
2+
"projects": ["."],
3+
"sdk": {
4+
"version": "1.0.0-rc1-final"
5+
}
36
}

‎samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
using System;
2-
using System.Linq;
3-
using Microsoft.AspNet.Identity;
4-
using Microsoft.AspNet.Identity.EntityFramework;
1+
using Microsoft.AspNet.Identity.EntityFramework;
52
using Microsoft.Data.Entity;
6-
using Microsoft.Data.Entity.Metadata;
7-
using Microsoft.Framework.OptionsModel;
83

94
namespace MusicStore.Models
105
{

‎samples/angular/MusicStore/Apis/Models/SampleData.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
using Microsoft.AspNet.Identity;
77
using Microsoft.AspNet.Identity.EntityFramework;
88
using Microsoft.Data.Entity;
9-
using Microsoft.Data.Entity.Storage;
10-
using Microsoft.Framework.DependencyInjection;
11-
using Microsoft.Framework.OptionsModel;
12-
using MusicStore;
13-
using MusicStore.Models;
9+
using Microsoft.Extensions.DependencyInjection;
10+
using Microsoft.Extensions.OptionsModel;
1411

1512
namespace MusicStore.Models
1613
{

‎samples/angular/MusicStore/Startup.cs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using AutoMapper;
61
using Microsoft.AspNet.Authorization;
72
using Microsoft.AspNet.Builder;
83
using Microsoft.AspNet.Hosting;
9-
using Microsoft.AspNet.Http;
104
using Microsoft.AspNet.Identity.EntityFramework;
115
using Microsoft.Data.Entity;
12-
using Microsoft.Dnx.Runtime;
13-
using Microsoft.Framework.Configuration;
14-
using Microsoft.Framework.DependencyInjection;
15-
using Microsoft.Framework.Logging;
6+
using Microsoft.Extensions.Configuration;
7+
using Microsoft.Extensions.DependencyInjection;
8+
using Microsoft.Extensions.Logging;
9+
using Microsoft.Extensions.PlatformAbstractions;
10+
using AutoMapper;
1611
using MusicStore.Apis;
1712
using MusicStore.Models;
1813

@@ -86,7 +81,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
8681
// Initialize the sample data
8782
SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
8883

89-
loggerFactory.MinimumLevel = LogLevel.Information;
84+
loggerFactory.MinimumLevel = LogLevel.Warning;
9085
loggerFactory.AddConsole();
9186
loggerFactory.AddDebug();
9287

0 commit comments

Comments
 (0)