From e1fb12bafa9bb5b1d657d223a4131c63cd4c2349 Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Wed, 25 Sep 2019 21:35:35 +0800
Subject: Init migration to dotnet core 3.0.0 .

---
 Timeline/Program.cs                    |  3 ++-
 Timeline/Services/UserAvatarService.cs |  4 ++--
 Timeline/Startup.cs                    | 18 +++++++++++-------
 Timeline/Timeline.csproj               |  6 ++----
 4 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'Timeline')

diff --git a/Timeline/Program.cs b/Timeline/Program.cs
index f343de44..dfc93b9e 100644
--- a/Timeline/Program.cs
+++ b/Timeline/Program.cs
@@ -2,6 +2,7 @@ using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
 
 namespace Timeline
 {
@@ -10,7 +11,7 @@ namespace Timeline
         public static void Main(string[] args)
         {
             CreateWebHostBuilder(args)
-            .ConfigureAppConfiguration((context, config) => 
+            .ConfigureAppConfiguration((context, config) =>
             {
                 if (context.HostingEnvironment.IsProduction())
                     config.AddJsonFile(new PhysicalFileProvider("/etc/webapp/timeline/"), "config.json", true, true);
diff --git a/Timeline/Services/UserAvatarService.cs b/Timeline/Services/UserAvatarService.cs
index 5c380dd8..ecec5a31 100644
--- a/Timeline/Services/UserAvatarService.cs
+++ b/Timeline/Services/UserAvatarService.cs
@@ -121,7 +121,7 @@ namespace Timeline.Services
 
     public class DefaultUserAvatarProvider : IDefaultUserAvatarProvider
     {
-        private readonly IHostingEnvironment _environment;
+        private readonly IWebHostEnvironment _environment;
 
         private readonly IETagGenerator _eTagGenerator;
 
@@ -129,7 +129,7 @@ namespace Timeline.Services
         private DateTime _cacheLastModified;
         private string _cacheETag;
 
-        public DefaultUserAvatarProvider(IHostingEnvironment environment, IETagGenerator eTagGenerator)
+        public DefaultUserAvatarProvider(IWebHostEnvironment environment, IETagGenerator eTagGenerator)
         {
             _environment = environment;
             _eTagGenerator = eTagGenerator;
diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index b5a5106b..f5ffe94e 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Timeline.Authenticate;
 using Timeline.Configs;
 using Timeline.Entities;
@@ -16,23 +16,23 @@ namespace Timeline
 {
     public class Startup
     {
-        public Startup(IConfiguration configuration, IHostingEnvironment environment)
+        public Startup(IConfiguration configuration, IWebHostEnvironment environment)
         {
             Environment = environment;
             Configuration = configuration;
         }
 
-        public IHostingEnvironment Environment { get; }
+        public IWebHostEnvironment Environment { 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)
         {
             services.AddMvc()
-                .ConfigureApiBehaviorOptions(options =>{
+                .ConfigureApiBehaviorOptions(options =>
+                {
                     options.InvalidModelStateResponseFactory = InvalidModelResponseFactory.Factory;
-                })
-                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+                });
 
             services.Configure<JwtConfig>(Configuration.GetSection(nameof(JwtConfig)));
             var jwtConfig = Configuration.GetSection(nameof(JwtConfig)).Get<JwtConfig>();
@@ -75,9 +75,13 @@ namespace Timeline
                 ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
             });
 
+            app.UseRouting();
+
             app.UseAuthentication();
 
-            app.UseMvc();
+            app.UseEndpoints(endpoints =>
+            {
+            });
         }
     }
 }
diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj
index d414ab2f..836376d9 100644
--- a/Timeline/Timeline.csproj
+++ b/Timeline/Timeline.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <UserSecretsId>1f6fb74d-4277-4bc0-aeea-b1fc5ffb0b43</UserSecretsId>
         <Authors>crupest</Authors>
@@ -13,11 +13,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-dev002868" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.5.0" />
     </ItemGroup>
 </Project>
-- 
cgit v1.2.3