Skip to content

Commit 249451d

Browse files
linezerolinezero
committed
ASP.NET Core 2.1
1 parent 92239a5 commit 249451d

File tree

12 files changed

+64
-47
lines changed

12 files changed

+64
-47
lines changed

‎src/ApplicationCore/ApplicationCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.3" />
1010
</ItemGroup>
1111

1212
</Project>

‎src/Infrastructure/Infrastructure.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
14-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.3">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
16+
</PackageReference>
1517
</ItemGroup>
1618

1719
</Project>

‎src/NetCoreBBS/Areas/Admin/Views/Topic/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
}
8585
</tbody>
8686
</table>
87-
@Html.Partial("_PagerPartial", ViewData)
87+
@await Html.PartialAsync("_PagerPartial", ViewData)
8888
</div>
8989
<div id="replyModal" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel">
9090
<div class="modal-dialog modal-lg">

‎src/NetCoreBBS/Areas/Admin/Views/User/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@
7777
}
7878
</tbody>
7979
</table>
80-
@Html.Partial("_PagerPartial", ViewData)
80+
@await Html.PartialAsync("_PagerPartial", ViewData)

‎src/NetCoreBBS/NetCoreBBS.csproj‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<DebugType>portable</DebugType>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<AssemblyName>NetCoreBBS</AssemblyName>
88
<OutputType>Exe</OutputType>
99
<PackageId>NetCoreBBS</PackageId>
10-
<RuntimeIdentifiers>ubuntu.14.04-x64</RuntimeIdentifiers>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
@@ -17,21 +16,11 @@
1716
</ItemGroup>
1817

1918
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
22-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
23-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
24-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.0" />
30-
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-beta5" />
31-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.0" />
32-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
34-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />
19+
<PackageReference Include="Microsoft.AspNetCore.App" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.3" />
21+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.4" />
22+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.6.0" />
23+
<PackageReference Include="NLog" Version="4.5.9" />
3524
</ItemGroup>
3625

3726
<Target Name="PrecompileScript" BeforeTargets="BeforeBuild">
@@ -43,8 +32,7 @@
4332
</Target>
4433

4534
<ItemGroup>
46-
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.6.362" />
47-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
35+
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.8.391" />
4836
</ItemGroup>
4937

5038
<ItemGroup>

‎src/NetCoreBBS/Program.cs‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,47 @@
33
using System.IO;
44
using System.Linq;
55
using System.Threading.Tasks;
6+
using Microsoft.AspNetCore;
67
using Microsoft.AspNetCore.Hosting;
8+
using Microsoft.Extensions.Logging;
9+
using NLog.Web;
710

811
namespace NetCoreBBS
912
{
1013
public class Program
1114
{
1215
public static void Main(string[] args)
1316
{
14-
var host = new WebHostBuilder()
15-
.UseKestrel()
16-
.UseContentRoot(Directory.GetCurrentDirectory())
17-
.UseUrls("http://*:80")
18-
.UseIISIntegration()
17+
// NLog: setup the logger first to catch all errors
18+
var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
19+
try
20+
{
21+
logger.Debug("init main");
22+
BuildWebHost(args).Run();
23+
}
24+
catch (Exception ex)
25+
{
26+
//NLog: catch setup errors
27+
logger.Error(ex, "Stopped program because of exception");
28+
throw;
29+
}
30+
finally
31+
{
32+
// Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
33+
NLog.LogManager.Shutdown();
34+
}
35+
}
36+
37+
public static IWebHost BuildWebHost(string[] args) =>
38+
WebHost.CreateDefaultBuilder(args)
1939
.UseStartup<Startup>()
40+
.UseUrls("http://*:80")
41+
.ConfigureLogging(logging =>
42+
{
43+
logging.ClearProviders();
44+
logging.SetMinimumLevel(LogLevel.Trace);
45+
})
46+
.UseNLog() // NLog: setup NLog for Dependency injection
2047
.Build();
21-
22-
host.Run();
23-
}
2448
}
2549
}

‎src/NetCoreBBS/Startup.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public void ConfigureServices(IServiceCollection services)
4848
}).AddEntityFrameworkStores<DataContext>().AddDefaultTokenProviders();
4949
// Add framework services.
5050
services.AddMvc();
51-
services.AddSingleton<IRepository<TopicNode>, Repository<TopicNode>>();
52-
services.AddSingleton<ITopicRepository, TopicRepository>();
53-
services.AddSingleton<ITopicReplyRepository, TopicReplyRepository>();
51+
services.AddScoped<IRepository<TopicNode>, Repository<TopicNode>>();
52+
services.AddScoped<ITopicRepository, TopicRepository>();
53+
services.AddScoped<ITopicReplyRepository, TopicReplyRepository>();
5454
services.AddScoped<IUserServices, UserServices>();
5555
services.AddScoped<UserServices>();
5656
services.AddMemoryCache();
@@ -73,9 +73,6 @@ public void ConfigureServices(IServiceCollection services)
7373
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
7474
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
7575
{
76-
loggerFactory.ConfigureNLog("nlog.config");
77-
loggerFactory.AddNLog();
78-
7976
app.UseRequestIPMiddleware();
8077

8178
InitializeNetCoreBBSDatabase(app.ApplicationServices);

‎src/NetCoreBBS/Views/Home/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
</div>
5151
<div class="panel-footer clearfix">
52-
@Html.Partial("_PagerPartial", ViewData)
52+
@await Html.PartialAsync("_PagerPartial", ViewData)
5353
</div>
5454
</div>
5555
<div class="panel panel-default" style="padding:15px">
@@ -111,6 +111,6 @@
111111
</div>
112112
</div>
113113
<div class="col-md-3">
114-
@Html.Partial("_SidebarPartial")
114+
@await Html.PartialAsync("_SidebarPartial")
115115
</div>
116116
</div>

‎src/NetCoreBBS/Views/Shared/_Layout.cshtml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<span class="icon-bar"></span>
2929
<span class="icon-bar"></span>
3030
</button>
31-
<a asp-controller="Home" asp-action="Index" class="navbar-brand"><b>NetCoreBBS</b></a>
31+
<a asp-controller="Home" asp-action="Index" class="navbar-brand"><b>NetCoreBBS</b>&nbsp;.NET Core 跨平台开发论坛
32+
</a>
3233
</div>
3334
<div id="navbar" class="navbar-collapse collapse">
3435
@await Html.PartialAsync("_LoginPartial")
@@ -42,7 +43,7 @@
4243
@RenderBody()
4344
<hr />
4445
<footer class="text-center">
45-
<p><a href="http://www.cnblogs.com/linezero/" target="_blank">LineZero</a>&copy; 2016 - NetCoreBBS</p>
46+
<p><a href="http://www.cnblogs.com/linezero/" target="_blank">LineZero</a>&copy; 2018 - NetCoreBBS</p>
4647
</footer>
4748
</div>
4849

‎src/NetCoreBBS/Views/Topic/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</div>
9595
</div>
9696
<div class="col-md-3">
97-
@Html.Partial("_SidebarPartial")
97+
@await Html.PartialAsync("_SidebarPartial")
9898
</div>
9999
</div>
100100
@section scripts{

0 commit comments

Comments
 (0)