upragde 3.0 unsupport nfx

realLiangshiwei · Oct 16, 2019 · b260e2a · b260e2a
1 parent 10988d9
commit b260e2a
Show file tree

Hide file tree

Showing 95 changed files with 36,308 additions and 8,679 deletions.
diff --git a/LogDashboard.sln b/LogDashboard.sln
@@ -30,10 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLog", "samples\St
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RequestTracking", "samples\RequestTracking\RequestTracking.csproj", "{CE4C8BDA-1960-4F96-9238-DFD4F9E76028}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfxAspNetMvc", "samples\NfxAspNetMvc\NfxAspNetMvc.csproj", "{CBC1255C-4DEE-4713-BB8C-AB2F3C040D01}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NfxAspnetCore", "samples\NfxAspnetCore\NfxAspnetCore.csproj", "{64D7FF5C-5300-429C-A64D-15C9A0809124}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UseSerilog", "samples\UseSerilog\UseSerilog.csproj", "{05DAB10F-93AA-487F-B2F2-0CC7FF459A3E}"
 EndProject
 Global
@@ -78,14 +74,6 @@ Global
 		{CE4C8BDA-1960-4F96-9238-DFD4F9E76028}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE4C8BDA-1960-4F96-9238-DFD4F9E76028}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE4C8BDA-1960-4F96-9238-DFD4F9E76028}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBC1255C-4DEE-4713-BB8C-AB2F3C040D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBC1255C-4DEE-4713-BB8C-AB2F3C040D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBC1255C-4DEE-4713-BB8C-AB2F3C040D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC1255C-4DEE-4713-BB8C-AB2F3C040D01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64D7FF5C-5300-429C-A64D-15C9A0809124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64D7FF5C-5300-429C-A64D-15C9A0809124}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64D7FF5C-5300-429C-A64D-15C9A0809124}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64D7FF5C-5300-429C-A64D-15C9A0809124}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05DAB10F-93AA-487F-B2F2-0CC7FF459A3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05DAB10F-93AA-487F-B2F2-0CC7FF459A3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05DAB10F-93AA-487F-B2F2-0CC7FF459A3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -104,8 +92,6 @@ Global
 		{B867F7D7-EB26-4C9A-AF62-905BDAADC42E} = {B7E1C8E9-D9C1-4687-851E-24A6F3240108}
 		{566D56EF-0B1A-4E96-A3AA-DC00EDFCBE39} = {B7E1C8E9-D9C1-4687-851E-24A6F3240108}
 		{CE4C8BDA-1960-4F96-9238-DFD4F9E76028} = {B7E1C8E9-D9C1-4687-851E-24A6F3240108}
-		{CBC1255C-4DEE-4713-BB8C-AB2F3C040D01} = {B7E1C8E9-D9C1-4687-851E-24A6F3240108}
-		{64D7FF5C-5300-429C-A64D-15C9A0809124} = {B7E1C8E9-D9C1-4687-851E-24A6F3240108}
 		{05DAB10F-93AA-487F-B2F2-0CC7FF459A3E} = {B7E1C8E9-D9C1-4687-851E-24A6F3240108}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/samples/CustomLogModel/CustomLogModel.csproj b/samples/CustomLogModel/CustomLogModel.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
+    <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.7.1" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/CustomLogModel/Startup.cs b/samples/CustomLogModel/Startup.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using NLog;
 
 namespace CustomLogModel
@@ -20,7 +21,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)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
 
             if (env.IsDevelopment())

diff --git a/samples/DatabaseSource/DatabaseSource.csproj b/samples/DatabaseSource/DatabaseSource.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.7.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.0.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
   </ItemGroup>
 
 

diff --git a/samples/DatabaseSource/Startup.cs b/samples/DatabaseSource/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NLog;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -39,11 +40,11 @@ public void ConfigureServices(IServiceCollection services)
                 opt.CustomLogModel<CustomLogModel>();
             });
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Latest);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
@@ -62,11 +63,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseLogDashboard();
 
-            app.UseMvc(routes =>
+            app.UseEndpoints(routes =>
             {
-                routes.MapRoute(
+                routes.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }

diff --git a/samples/DotNetCoreEmptyUseNlog/DotNetCoreEmptyUseNlog.csproj b/samples/DotNetCoreEmptyUseNlog/DotNetCoreEmptyUseNlog.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.7.1" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/DotNetCoreEmptyUseNlog/Startup.cs b/samples/DotNetCoreEmptyUseNlog/Startup.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace DotNetCoreEmpty
@@ -19,7 +20,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)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
 
             // 静态文件中间件