Merge pull request #92 from aspnetboilerplate/pr/6073

ismcagdas · web-flow · commit e39178c9d5ae · 2021-03-24T12:42:41.000+03:00
Update templates to ABP 6.3
diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="6.2.0" />
-    <PackageReference Include="Abp.AutoMapper" Version="6.2.0" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="6.3.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="6.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="6.2.0" />
+    <PackageReference Include="Abp" Version="6.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
   </ItemGroup>
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="6.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="5.0.0" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="6.3.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj
@@ -39,10 +39,10 @@
     <PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
     <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="Abp.AspNetCore" Version="6.2.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="6.2.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="6.3.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="6.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Startup/AbpProjectNameWebModule.cs b/src/AbpCompanyName.AbpProjectName.Web/Startup/AbpProjectNameWebModule.cs
@@ -18,7 +18,7 @@ public class AbpProjectNameWebModule : AbpModule
     {
         private readonly IConfigurationRoot _appConfiguration;
 
-        public AbpProjectNameWebModule(IHostingEnvironment env)
+        public AbpProjectNameWebModule(IWebHostEnvironment env)
         {
             _appConfiguration = AppConfigurations.Get(env.ContentRootPath, env.EnvironmentName);
         }
@@ -46,4 +46,4 @@ public override void PostInitialize()
                 .AddApplicationPartsIfNotAddedBefore(typeof(AbpProjectNameWebModule).Assembly);
         }
     }
-}
+}
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs b/src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs
@@ -57,7 +57,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseDatabaseErrorPage();
             }
             else
             {
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Views/Shared/Components/LanguageSelection/LanguageSelectionViewComponent.cs b/src/AbpCompanyName.AbpProjectName.Web/Views/Shared/Components/LanguageSelection/LanguageSelectionViewComponent.cs
@@ -22,7 +22,7 @@ public async Task<IViewComponentResult> InvokeAsync()
                 CurrentUrl = Request.Path
             };
 
-            return View(model);
+            return await Task.FromResult(View(model));
         }
     }
 }
diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -29,7 +29,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Shouldly" Version="3.0.2" />
-    <PackageReference Include="Abp.TestBase" Version="6.2.0" />
+    <PackageReference Include="Abp.TestBase" Version="6.3.0" />
     <PackageReference Include="NSubstitute" Version="4.2.1" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj
@@ -31,7 +31,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Abp.AspNetCore.TestBase" Version="6.2.0" />
+    <PackageReference Include="Abp.AspNetCore.TestBase" Version="6.3.0" />
     <PackageReference Include="AngleSharp" Version="0.13.0" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class AbpProjectNameWebModule : AbpModule`
`18`	`18`	`{`
`19`	`19`	`private readonly IConfigurationRoot _appConfiguration;`
`20`	`20`
`21`		`- public AbpProjectNameWebModule(IHostingEnvironment env)`
	`21`	`+ public AbpProjectNameWebModule(IWebHostEnvironment env)`
`22`	`22`	`{`
`23`	`23`	`_appConfiguration = AppConfigurations.Get(env.ContentRootPath, env.EnvironmentName);`
`24`	`24`	`}`
`@@ -46,4 +46,4 @@ public override void PostInitialize()`
`46`	`46`	`.AddApplicationPartsIfNotAddedBefore(typeof(AbpProjectNameWebModule).Assembly);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`-}`
	`49`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF`
`57`	`57`	`if (env.IsDevelopment())`
`58`	`58`	`{`
`59`	`59`	`app.UseDeveloperExceptionPage();`
`60`		`- app.UseDatabaseErrorPage();`
`61`	`60`	`}`
`62`	`61`	`else`
`63`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public async Task<IViewComponentResult> InvokeAsync()`
`22`	`22`	`CurrentUrl = Request.Path`
`23`	`23`	`};`
`24`	`24`
`25`		`- return View(model);`
	`25`	`+ return await Task.FromResult(View(model));`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`