From 7212f678208699b40573dfc815e2d45eccb97954 Mon Sep 17 00:00:00 2001
From: Spring Lee <1028789852@qq.com>
Date: Fri, 10 Jan 2020 23:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0core2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HttpReports.Dashboard.csproj                      | 11 +++++++++--
 src/HttpReports.Dashboard/Program.cs                  |  2 +-
 src/HttpReports.Dashboard/Startup.cs                  |  2 +-
 src/HttpReports.Dashboard/appsettings.json            |  6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/HttpReports.Dashboard/HttpReports.Dashboard.csproj b/src/HttpReports.Dashboard/HttpReports.Dashboard.csproj
index edb5c156..d401a820 100644
--- a/src/HttpReports.Dashboard/HttpReports.Dashboard.csproj
+++ b/src/HttpReports.Dashboard/HttpReports.Dashboard.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,6 +21,13 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
   </ItemGroup>
 
+
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.2'">
+    <PackageReference Include="Microsoft.AspNetCore.App" /> 
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
+  </ItemGroup> 
+  
+
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="2.1.2" PrivateAssets="All" />
diff --git a/src/HttpReports.Dashboard/Program.cs b/src/HttpReports.Dashboard/Program.cs
index a1493d6d..c8634f07 100644
--- a/src/HttpReports.Dashboard/Program.cs
+++ b/src/HttpReports.Dashboard/Program.cs
@@ -11,7 +11,7 @@ public static void Main(string[] args)
             CreateHostBuilder(args).Build().Run();
         }
 
-#if NETCOREAPP2_1
+#if NETCOREAPP2_1 || NETCOREAPP2_2
 
         public static IWebHostBuilder CreateHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
diff --git a/src/HttpReports.Dashboard/Startup.cs b/src/HttpReports.Dashboard/Startup.cs
index 92083aae..450b4724 100644
--- a/src/HttpReports.Dashboard/Startup.cs
+++ b/src/HttpReports.Dashboard/Startup.cs
@@ -48,7 +48,7 @@ public void Configure(IApplicationBuilder app)
             app.UseStaticFiles();
             app.UseCookiePolicy();
 
-#if NETCOREAPP2_1
+#if NETCOREAPP2_1 || NETCOREAPP2_2
 
             app.UseMvc(routes =>
             {
diff --git a/src/HttpReports.Dashboard/appsettings.json b/src/HttpReports.Dashboard/appsettings.json
index 415d6c1a..7a5d5a8e 100644
--- a/src/HttpReports.Dashboard/appsettings.json
+++ b/src/HttpReports.Dashboard/appsettings.json
@@ -1,10 +1,10 @@
 {
   "ConnectionStrings": {
-    "HttpReports": "Max Pool Size = 512;server=.;uid=sa;pwd=123456;database=HttpReports;"  
-    //"HttpReports": "DataBase=HttpReports;Data Source=localhost;User Id=root;Password=123456"
+    //"HttpReports": "Max Pool Size = 512;server=.;uid=sa;pwd=123456;database=HttpReports;"  
+    "HttpReports": "DataBase=HttpReports;Data Source=localhost;User Id=root;Password=123456"
   },
   "HttpReportsConfig": {
-    "DBType": "SqlServer", // MySql Or SqlServer
+    "DBType": "MySql", // MySql Or SqlServer
     "UserName": "admin",
     "Password": "123456"
   }