Switch to MapControllerRoute instead of UseMvc

framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/AspNetCore/Builder/AbpAspNetCoreMvcApplicationBuilderExtensions.cs

@@ -17,19 +17,15 @@ namespace Microsoft.AspNetCore.Builder
         /// <returns>A reference to this instance after the operation has completed.</returns>
         public static IApplicationBuilder UseMvcWithDefaultRouteAndArea(
             this IApplicationBuilder app, 
-            Action<IRouteBuilder> additionalConfigurationAction = null)
+            Action<IEndpointRouteBuilder> additionalConfigurationAction = null)
         {
-            return app.UseMvc(routes =>
+            return app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
+                endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
-                    name: "defaultWithArea",
+                endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
+                endpoints.MapRazorPages();
 
-                routes.MapRoute(
+                additionalConfigurationAction?.Invoke(endpoints);
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-
-                additionalConfigurationAction?.Invoke(routes);
             });
         }
     }

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs

@@ -77,10 +77,12 @@ namespace Volo.Abp.AspNetCore.Mvc
             var app = context.GetApplicationBuilder();
 
             app.UseCorrelationId();
+            app.UseRouting();
             app.UseMiddleware<FakeAuthenticationMiddleware>();
+            app.UseAuthorization();
             app.UseAuditing();
             app.UseUnitOfWork();
-            app.UseMvcWithDefaultRoute();
+            app.UseMvcWithDefaultRouteAndArea();
         }
     }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs

@@ -66,7 +66,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             var app = context.GetApplicationBuilder();
-            app.UseMvcWithDefaultRoute();
+            app.UseMvcWithDefaultRouteAndArea();
         }
     }
 }