From 6fc93e83c6ac4e17b8d88757833b1b0dc581e1ab Mon Sep 17 00:00:00 2001
From: MysticBoy <mysticboy@live.com>
Date: Wed, 30 Oct 2019 20:00:14 +0800
Subject: [PATCH] upgrade to .net core 3.0

---
 ...AspNetCoreSampleQuartzHostedService.csproj |  7 ++---
 .../Startup.cs                                | 11 +++++---
 .../SampleQuartzHostedService.csproj          |  5 ++--
 .../Properties/launchSettings.json            | 27 +++++++++++++++++++
 .../QuartzHostedService.csproj                |  5 ++--
 .../QuartzHostedService.Test.csproj           | 10 +++----
 6 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 src/QuartzHostedService/Properties/launchSettings.json

diff --git a/sample/AspNetCoreSampleQuartzHostedService/AspNetCoreSampleQuartzHostedService.csproj b/sample/AspNetCoreSampleQuartzHostedService/AspNetCoreSampleQuartzHostedService.csproj
index 1a248fd..1a91cb6 100644
--- a/sample/AspNetCoreSampleQuartzHostedService/AspNetCoreSampleQuartzHostedService.csproj
+++ b/sample/AspNetCoreSampleQuartzHostedService/AspNetCoreSampleQuartzHostedService.csproj
@@ -1,13 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/AspNetCoreSampleQuartzHostedService/Startup.cs b/sample/AspNetCoreSampleQuartzHostedService/Startup.cs
index 7105e1e..ecd6ab6 100644
--- a/sample/AspNetCoreSampleQuartzHostedService/Startup.cs
+++ b/sample/AspNetCoreSampleQuartzHostedService/Startup.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Quartz;
@@ -27,7 +28,7 @@ namespace AspNetCoreSampleQuartzHostedService
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddControllersWithViews();
             services.AddOptions();
             services.Configure<AppSettings>(Configuration);
             services.Configure<InjectProperty>(options => { options.WriteText = "This is inject string"; });
@@ -39,13 +40,17 @@ namespace AspNetCoreSampleQuartzHostedService
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, IOptions<AppSettings> settings)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IOptions<AppSettings> settings)
         {
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
-            app.UseMvc();
+            app.UseRouting();
+            app.UseEndpoints(endpoint =>
+            {
+                endpoint.MapControllers();
+            });
             if (settings.Value.EnableHelloSingleJob)
             {
                 app.UseQuartzJob<HelloJobSingle>(TriggerBuilder.Create().WithSimpleSchedule(x => x.WithIntervalInSeconds(1).RepeatForever()))
diff --git a/sample/SampleQuartzHostedService/SampleQuartzHostedService.csproj b/sample/SampleQuartzHostedService/SampleQuartzHostedService.csproj
index 93ea6e2..bad6615 100644
--- a/sample/SampleQuartzHostedService/SampleQuartzHostedService.csproj
+++ b/sample/SampleQuartzHostedService/SampleQuartzHostedService.csproj
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
     <PackageReference Include="Quartz" Version="3.0.7" />
   </ItemGroup>
 
diff --git a/src/QuartzHostedService/Properties/launchSettings.json b/src/QuartzHostedService/Properties/launchSettings.json
new file mode 100644
index 0000000..45f479f
--- /dev/null
+++ b/src/QuartzHostedService/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:56070/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "QuartzHostedService": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:56071/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/QuartzHostedService/QuartzHostedService.csproj b/src/QuartzHostedService/QuartzHostedService.csproj
index c629c8f..cccce8a 100644
--- a/src/QuartzHostedService/QuartzHostedService.csproj
+++ b/src/QuartzHostedService/QuartzHostedService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <Authors>mukmyash</Authors>
     <Company />
     <Version>0.0.4</Version>
@@ -12,8 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Quartz" Version="3.0.7" />
   </ItemGroup>
 
diff --git a/test/QuartzHostedService.Test/QuartzHostedService.Test.csproj b/test/QuartzHostedService.Test/QuartzHostedService.Test.csproj
index 180f193..79ed54c 100644
--- a/test/QuartzHostedService.Test/QuartzHostedService.Test.csproj
+++ b/test/QuartzHostedService.Test/QuartzHostedService.Test.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="5.0.0" />
-    <PackageReference Include="FluentAssertions" Version="5.5.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="FakeItEasy" Version="5.4.0" />
+    <PackageReference Include="FluentAssertions" Version="5.9.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>