Merge pull request #486 from aspnetboilerplate/maliming/patch2

ismcagdas · web-flow · commit 66b821c49750 · 2019-11-05T09:26:46.000+03:00
Remove unnecessary cookie scheme.
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -16,8 +16,4 @@
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-  
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -17,10 +17,6 @@
     <EmbeddedResource Include="Localization\SourceFiles\*.xml" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Abp.AutoMapper" Version="5.0.0" />
     <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="5.0.0" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
@@ -15,10 +15,6 @@
     <Compile Remove="Migrations\20190111071724_Upgraded_To_Abp_v4_1_0.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
@@ -17,10 +17,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Abp.Castle.Log4Net" Version="5.0.0" />
   </ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -24,10 +24,6 @@
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs
@@ -23,10 +23,10 @@ namespace AbpCompanyName.AbpProjectName
      )]
     public class AbpProjectNameWebCoreModule : AbpModule
     {
-        private readonly IHostingEnvironment _env;
+        private readonly IWebHostEnvironment _env;
         private readonly IConfigurationRoot _appConfiguration;
 
-        public AbpProjectNameWebCoreModule(IHostingEnvironment env)
+        public AbpProjectNameWebCoreModule(IWebHostEnvironment env)
         {
             _env = env;
             _appConfiguration = env.GetAppConfiguration();
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Configuration/HostingEnvironmentExtensions.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Configuration/HostingEnvironmentExtensions.cs
@@ -1,11 +1,12 @@
 ﻿using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 
 namespace AbpCompanyName.AbpProjectName.Configuration
 {
     public static class HostingEnvironmentExtensions
     {
-        public static IConfigurationRoot GetAppConfiguration(this IHostingEnvironment env)
+        public static IConfigurationRoot GetAppConfiguration(this IWebHostEnvironment env)
         {
             return AppConfigurations.Get(env.ContentRootPath, env.EnvironmentName, env.IsDevelopment());
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -8,8 +8,6 @@
     <OutputType>Exe</OutputType>
     <PackageId>AbpCompanyName.AbpProjectName.Web.Host</PackageId>
     <UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
-
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <LangVersion>7.2</LangVersion>
@@ -33,10 +31,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Web.Core\AbpCompanyName.AbpProjectName.Web.Core.csproj" />
   </ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/AbpProjectNameWebHostModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/AbpProjectNameWebHostModule.cs
@@ -10,10 +10,10 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
        typeof(AbpProjectNameWebCoreModule))]
     public class AbpProjectNameWebHostModule: AbpModule
     {
-        private readonly IHostingEnvironment _env;
+        private readonly IWebHostEnvironment _env;
         private readonly IConfigurationRoot _appConfiguration;
 
-        public AbpProjectNameWebHostModule(IHostingEnvironment env)
+        public AbpProjectNameWebHostModule(IWebHostEnvironment env)
         {
             _env = env;
             _appConfiguration = env.GetAppConfiguration();
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs
@@ -27,7 +27,7 @@ public class Startup
 
         private readonly IConfigurationRoot _appConfiguration;
 
-        public Startup(IHostingEnvironment env)
+        public Startup(IWebHostEnvironment env)
         {
             _appConfiguration = env.GetAppConfiguration();
         }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Mvc</AssemblyName>
@@ -7,15 +7,13 @@
     <UserSecretsId>AbpCompanyName-AbpProjectName-56C2EF2F-ABD6-4EFC-AAF2-2E81C34E8FB1</UserSecretsId>
     <RootNamespace>AbpCompanyName.AbpProjectName.Web</RootNamespace>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
-    
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,10 +34,6 @@
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Web.Core\AbpCompanyName.AbpProjectName.Web.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Resources/WebResourceManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Resources/WebResourceManager.cs
@@ -5,15 +5,16 @@
 using Abp.Collections.Extensions;
 using Abp.Extensions;
 using Abp.Timing;
+using Microsoft.Extensions.Hosting;
 
 namespace AbpCompanyName.AbpProjectName.Web.Resources
 {
     public class WebResourceManager : IWebResourceManager
     {
-        private readonly IHostingEnvironment _environment;
+        private readonly IWebHostEnvironment _environment;
         private readonly List<string> _scriptUrls;
 
-        public WebResourceManager(IHostingEnvironment environment)
+        public WebResourceManager(IWebHostEnvironment environment)
         {
             _environment = environment;
             _scriptUrls = new List<string>();
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/AbpProjectNameWebMvcModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/AbpProjectNameWebMvcModule.cs
@@ -9,10 +9,10 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
     [DependsOn(typeof(AbpProjectNameWebCoreModule))]
     public class AbpProjectNameWebMvcModule : AbpModule
     {
-        private readonly IHostingEnvironment _env;
+        private readonly IWebHostEnvironment _env;
         private readonly IConfigurationRoot _appConfiguration;
 
-        public AbpProjectNameWebMvcModule(IHostingEnvironment env)
+        public AbpProjectNameWebMvcModule(IWebHostEnvironment env)
         {
             _env = env;
             _appConfiguration = env.GetAppConfiguration();
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
@@ -16,7 +16,7 @@
 using Abp.AspNetCore.SignalR.Hubs;
 using Abp.Dependency;
 using Abp.Json;
-using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json.Serialization;
 
 
@@ -26,7 +26,7 @@ public class Startup
     {
         private readonly IConfigurationRoot _appConfiguration;
 
-        public Startup(IHostingEnvironment env)
+        public Startup(IWebHostEnvironment env)
         {
             _appConfiguration = env.GetAppConfiguration();
         }
@@ -48,9 +48,6 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                 };
             });
 
-            services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-                .AddCookie();
-
             IdentityRegistrar.Register(services);
             AuthConfigurer.Configure(services, _appConfiguration);
 
@@ -67,7 +64,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             );
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
             app.UseAbp(); // Initializes ABP framework.
 

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ namespace AbpCompanyName.AbpProjectName`
`23`	`23`	`)]`
`24`	`24`	`public class AbpProjectNameWebCoreModule : AbpModule`
`25`	`25`	`{`
`26`		`- private readonly IHostingEnvironment _env;`
	`26`	`+ private readonly IWebHostEnvironment _env;`
`27`	`27`	`private readonly IConfigurationRoot _appConfiguration;`
`28`	`28`
`29`		`- public AbpProjectNameWebCoreModule(IHostingEnvironment env)`
	`29`	`+ public AbpProjectNameWebCoreModule(IWebHostEnvironment env)`
`30`	`30`	`{`
`31`	`31`	`_env = env;`
`32`	`32`	`_appConfiguration = env.GetAppConfiguration();`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`using Microsoft.AspNetCore.Hosting;`
`2`	`2`	`using Microsoft.Extensions.Configuration;`
	`3`	`+using Microsoft.Extensions.Hosting;`
`3`	`4`
`4`	`5`	`namespace AbpCompanyName.AbpProjectName.Configuration`
`5`	`6`	`{`
`6`	`7`	`public static class HostingEnvironmentExtensions`
`7`	`8`	`{`
`8`		`- public static IConfigurationRoot GetAppConfiguration(this IHostingEnvironment env)`
	`9`	`+ public static IConfigurationRoot GetAppConfiguration(this IWebHostEnvironment env)`
`9`	`10`	`{`
`10`	`11`	`return AppConfigurations.Get(env.ContentRootPath, env.EnvironmentName, env.IsDevelopment());`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup`
`10`	`10`	`typeof(AbpProjectNameWebCoreModule))]`
`11`	`11`	`public class AbpProjectNameWebHostModule: AbpModule`
`12`	`12`	`{`
`13`		`- private readonly IHostingEnvironment _env;`
	`13`	`+ private readonly IWebHostEnvironment _env;`
`14`	`14`	`private readonly IConfigurationRoot _appConfiguration;`
`15`	`15`
`16`		`- public AbpProjectNameWebHostModule(IHostingEnvironment env)`
	`16`	`+ public AbpProjectNameWebHostModule(IWebHostEnvironment env)`
`17`	`17`	`{`
`18`	`18`	`_env = env;`
`19`	`19`	`_appConfiguration = env.GetAppConfiguration();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class Startup`
`27`	`27`
`28`	`28`	`private readonly IConfigurationRoot _appConfiguration;`
`29`	`29`
`30`		`- public Startup(IHostingEnvironment env)`
	`30`	`+ public Startup(IWebHostEnvironment env)`
`31`	`31`	`{`
`32`	`32`	`_appConfiguration = env.GetAppConfiguration();`
`33`	`33`	`}`