ASP.NET Core 3.0

linezero · linezero · commit 0991832b37c3 · 2019-10-13T15:46:39.000+08:00
diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>NetCoreBBS</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>NetCoreBBS.Infrastructure</RootNamespace>
   </PropertyGroup>
 
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/NetCoreBBS/Controllers/UserController.cs b/src/NetCoreBBS/Controllers/UserController.cs
@@ -19,8 +19,8 @@ public class UserController : Controller
         private ITopicRepository _topic;
         private ITopicReplyRepository _reply;
         private UserManager<User> UserManager;
-        private IHostingEnvironment _env;
-        public UserController(ITopicRepository topic, ITopicReplyRepository reply, UserManager<User> userManager, IHostingEnvironment env)
+        private IWebHostEnvironment _env;
+        public UserController(ITopicRepository topic, ITopicReplyRepository reply, UserManager<User> userManager, IWebHostEnvironment env)
         {
             _topic = topic;
             _reply = reply;
diff --git a/src/NetCoreBBS/NetCoreBBS.csproj b/src/NetCoreBBS/NetCoreBBS.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <DebugType>portable</DebugType>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>NetCoreBBS</AssemblyName>
@@ -16,11 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.8.1" />
-    <PackageReference Include="NLog" Version="4.6.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
+    <PackageReference Include="NLog" Version="4.6.7" />
   </ItemGroup>
 
   <Target Name="PrecompileScript" BeforeTargets="BeforeBuild">
diff --git a/src/NetCoreBBS/Startup.cs b/src/NetCoreBBS/Startup.cs
@@ -24,16 +24,12 @@ namespace NetCoreBBS
 {
     public class Startup
     {
-        public Startup(IHostingEnvironment env)
+        public Startup(IConfiguration configuration)
         {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
+            Configuration = configuration;
         }
 
-        public IConfigurationRoot Configuration { get; }
+        public IConfiguration Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
@@ -47,7 +43,9 @@ public void ConfigureServices(IServiceCollection services)
                 };
             }).AddEntityFrameworkStores<DataContext>().AddDefaultTokenProviders();
             // Add framework services.
-            services.AddMvc();
+            services.AddMvc(option=> {
+                option.EnableEndpointRouting = false;
+            });
             services.AddScoped<IRepository<TopicNode>, Repository<TopicNode>>();
             services.AddScoped<ITopicRepository, TopicRepository>();
             services.AddScoped<ITopicReplyRepository, TopicReplyRepository>();
@@ -71,7 +69,7 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
             app.UseRequestIPMiddleware();
 
diff --git a/tests/UnitTests/UnitTests.csproj b/tests/UnitTests/UnitTests.csproj
@@ -1,13 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>    
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="coverlet.collector" Version="1.0.1" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,12 @@ namespace NetCoreBBS`
`24`	`24`	`{`
`25`	`25`	`public class Startup`
`26`	`26`	`{`
`27`		`- public Startup(IHostingEnvironment env)`
	`27`	`+ public Startup(IConfiguration configuration)`
`28`	`28`	`{`
`29`		`- var builder = new ConfigurationBuilder()`
`30`		`- .SetBasePath(env.ContentRootPath)`
`31`		`- .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)`
`32`		`- .AddEnvironmentVariables();`
`33`		`- Configuration = builder.Build();`
	`29`	`+ Configuration = configuration;`
`34`	`30`	`}`
`35`	`31`
`36`		`- public IConfigurationRoot Configuration { get; }`
	`32`	`+ public IConfiguration Configuration { get; }`
`37`	`33`
`38`	`34`	`// This method gets called by the runtime. Use this method to add services to the container.`
`39`	`35`	`public void ConfigureServices(IServiceCollection services)`
`@@ -47,7 +43,9 @@ public void ConfigureServices(IServiceCollection services)`
`47`	`43`	`};`
`48`	`44`	`}).AddEntityFrameworkStores<DataContext>().AddDefaultTokenProviders();`
`49`	`45`	`// Add framework services.`
`50`		`- services.AddMvc();`
	`46`	`+ services.AddMvc(option=> {`
	`47`	`+ option.EnableEndpointRouting = false;`
	`48`	`+ });`
`51`	`49`	`services.AddScoped<IRepository<TopicNode>, Repository<TopicNode>>();`
`52`	`50`	`services.AddScoped<ITopicRepository, TopicRepository>();`
`53`	`51`	`services.AddScoped<ITopicReplyRepository, TopicReplyRepository>();`
`@@ -71,7 +69,7 @@ public void ConfigureServices(IServiceCollection services)`
`71`	`69`	`}`
`72`	`70`
`73`	`71`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`74`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)`
	`72`	`+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)`
`75`	`73`	`{`
`76`	`74`	`app.UseRequestIPMiddleware();`
`77`	`75`