Skip to content

Commit 42a2285

Browse files
yukozhyukozh
committed
Update to rc1
1 parent f078248 commit 42a2285

File tree

11 files changed

+7902
-6551
lines changed

11 files changed

+7902
-6551
lines changed

‎NuGet.Config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetbeta8/api/v2/" />
5-
<add key="Code Comb" value="https://www.myget.org/F/codecomb-beta8/api/v2/" />
64
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
75
</packageSources>
86
<disabledPackageSources />

‎global.json‎

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

‎src/YuukoBlog/Controllers/BaseController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNet.Mvc;
66
using Microsoft.Data.Entity;
7-
using Microsoft.Framework.Configuration;
8-
using Microsoft.Framework.DependencyInjection;
7+
using Microsoft.Extensions.Configuration;
8+
using Microsoft.Extensions.DependencyInjection;
99
using CodeComb.AspNet.Localization;
1010
using YuukoBlog.Models;
1111

‎src/YuukoBlog/Filters/AdminRequiredAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.AspNet.Mvc;
66
using Microsoft.AspNet.Mvc.Filters;
77
using Microsoft.AspNet.Http;
8-
using Microsoft.Framework.Internal;
8+
using Microsoft.Extensions.Internal;
99

1010
namespace YuukoBlog.Filters
1111
{

‎src/YuukoBlog/Filters/GuestRequiredAttribute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.AspNet.Mvc;
66
using Microsoft.AspNet.Mvc.Filters;
77
using Microsoft.AspNet.Http;
8-
using Microsoft.Framework.Internal;
8+
using Microsoft.Extensions.Internal;
99

1010
namespace YuukoBlog.Filters
1111
{

‎src/YuukoBlog/Models/BlogContext.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
2222

2323
modelBuilder.Entity<Catalog>(e =>
2424
{
25-
e.Index(x => x.PRI);
25+
e.HasIndex(x => x.PRI);
2626
});
2727

2828
modelBuilder.Entity<Post>(e =>
2929
{
30-
e.Index(x => x.IsPage);
31-
e.Index(x => x.Time);
32-
e.Index(x => x.Url).Unique();
30+
e.HasIndex(x => x.IsPage);
31+
e.HasIndex(x => x.Time);
32+
e.HasIndex(x => x.Url).IsUnique();
3333
});
3434

3535
modelBuilder.Entity<PostTag>(e =>
3636
{
37-
e.Index(x => x.Tag);
37+
e.HasIndex(x => x.Tag);
3838
});
3939

4040
modelBuilder.Entity<Blob>(e =>
4141
{
42-
e.Index(x => x.Time);
43-
e.Index(x => x.ContentLength);
44-
e.Index(x => x.ContentType);
42+
e.HasIndex(x => x.Time);
43+
e.HasIndex(x => x.ContentLength);
44+
e.HasIndex(x => x.ContentType);
4545
});
4646
}
4747
}

‎src/YuukoBlog/Models/SampleData.cs‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,16 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5-
using Microsoft.Framework.DependencyInjection;
5+
using Microsoft.Extensions.DependencyInjection;
66

77
namespace YuukoBlog.Models
88
{
99
public static class SampleData
1010
{
1111
public static async Task InitializeYuukoBlog(IServiceProvider serviceProvider)
1212
{
13-
try
14-
{
15-
using (var db = serviceProvider.GetService<BlogContext>())
16-
{
17-
var sqlServerDatabase = db.Database;
18-
if (sqlServerDatabase != null)
19-
{
20-
if (await sqlServerDatabase.EnsureCreatedAsync())
21-
{
22-
//
23-
}
24-
}
25-
else
26-
{
27-
//
28-
}
29-
}
30-
}
31-
catch
32-
{
33-
}
13+
var db = serviceProvider.GetService<BlogContext>();
14+
await db.Database.EnsureCreatedAsync();
3415
}
3516
}
3617
}

‎src/YuukoBlog/Startup.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
52
using Microsoft.AspNet.Builder;
6-
using Microsoft.AspNet.Http;
7-
using Microsoft.AspNet.Mvc;
8-
using Microsoft.Framework.Logging;
9-
using Microsoft.Framework.Configuration;
10-
using Microsoft.Framework.DependencyInjection;
11-
using Microsoft.Dnx.Runtime;
3+
using Microsoft.Extensions.Logging;
4+
using Microsoft.Extensions.Configuration;
5+
using Microsoft.Extensions.DependencyInjection;
6+
using Microsoft.Extensions.PlatformAbstractions;
127
using Microsoft.Data.Entity;
13-
using Microsoft.AspNet.Hosting;
148
using YuukoBlog.Models;
159

1610
namespace YuukoBlog

‎src/YuukoBlog/Templates/Default/Shared/Sidebar.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="grid_3">
22
<div class="sidebar">
33
@Html.Partial("PostInfo")
4-
@Html.Partial($"~/Templates/{Template.Current.Identifier}/Shared/Catalog")
4+
@Html.Partial($"~/Templates/{Template.Current.Identifier}/Shared/Catalog.cshtml")
55
@Html.Partial("Tag")
66
@Html.Partial("Calendar")
77
@Html.Partial("Admin")

‎src/YuukoBlog/project.json‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
{
22
"webroot": "wwwroot",
3-
"version": "2.0.0-beta8",
3+
"version": "2.0.0-rc1-final",
44

55
"dependencies": {
6-
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta8",
7-
"Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
8-
"CodeComb.AspNet.Localization": "2.0.0-beta8",
9-
"CodeComb.AspNet.Extensions": "2.0.0-beta8",
10-
"CodeComb.Marked": "2.0.0-beta8",
11-
"Microsoft.AspNet.Mvc": "6.0.0-beta8",
12-
"Microsoft.AspNet.Session": "1.0.0-beta8",
13-
"EntityFramework.Sqlite": "7.0.0-beta8",
14-
"Microsoft.Framework.Logging": "1.0.0-beta8",
15-
"Microsoft.Framework.Logging.Console": "1.0.0-beta8",
16-
"Microsoft.Framework.Logging.Debug": "1.0.0-beta8",
17-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8",
18-
"EntityFramework.SqlServer": "7.0.0-beta8",
19-
"Microsoft.AspNet.StaticFiles": "1.0.0-beta8"
6+
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-final",
7+
"Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
8+
"CodeComb.AspNet.Localization": "2.0.0-rc1-final",
9+
"CodeComb.AspNet.Extensions": "2.0.0-rc1-final",
10+
"CodeComb.Marked": "2.0.0-rc1-final",
11+
"Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
12+
"Microsoft.AspNet.Session": "1.0.0-rc1-final",
13+
"EntityFramework.Sqlite": "7.0.0-rc1-final",
14+
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
15+
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
16+
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
17+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
18+
"EntityFramework.MicrosoftSqlServer": "7.0.0-rc1-final",
19+
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final"
2020
},
2121

2222
"commands": {
23-
"kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --config hosting.json",
24-
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --config hosting.json"
23+
"web": "Microsoft.AspNet.Server.Kestrel"
2524
},
2625

2726
"frameworks": {

0 commit comments

Comments
 (0)