Browse Source

Resolved #739 Use UseMvcWithDefaultRouteAndArea in the samples/templates

pull/798/head
Yunus Emre Kalkan 8 years ago
parent
commit
7c818445b0
  1. 12
      abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
  2. 1
      samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs
  3. 10
      templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs
  4. 11
      templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
  5. 11
      templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs

12
abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs

@ -158,18 +158,8 @@ namespace Volo.AbpWebSite
app.UseVirtualFiles(); app.UseVirtualFiles();
app.UseAuthentication(); app.UseAuthentication();
//TODO: Create an extension method!
app.UseMvc(routes =>
{
routes.MapRoute(
name: "defaultWithArea",
template: "{area}/{controller=Home}/{action=Index}/{id?}");
routes.MapRoute( app.UseMvcWithDefaultRouteAndArea();
name: "default",
template: "{controller=Home}/{action=Index}/{id?}");
});
AsyncHelper.RunSync(async () => AsyncHelper.RunSync(async () =>
{ {

1
samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs

@ -162,6 +162,7 @@ namespace Acme.BookStore
options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API");
}); });
//TODO: use app.UseMvcWithDefaultRouteAndArea(); after v1.3.0 release
app.UseMvc(routes => app.UseMvc(routes =>
{ {
routes.MapRoute( routes.MapRoute(

10
templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs

@ -110,16 +110,8 @@ namespace MyCompanyName.MyProjectName.DemoApp
app.UseAbpRequestLocalization(); app.UseAbpRequestLocalization();
app.UseAuditing(); app.UseAuditing();
app.UseMvc(routes =>
{
routes.MapRoute(
name: "defaultWithArea",
template: "{area}/{controller=Home}/{action=Index}/{id?}");
routes.MapRoute( app.UseMvcWithDefaultRouteAndArea();
name: "default",
template: "{controller=Home}/{action=Index}/{id?}");
});
AsyncHelper.RunSync(async () => AsyncHelper.RunSync(async () =>
{ {

11
templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@ -182,16 +182,7 @@ namespace MyCompanyName.MyProjectName
app.UseAuditing(); app.UseAuditing();
app.UseMvc(routes => app.UseMvcWithDefaultRouteAndArea();
{
routes.MapRoute(
name: "defaultWithArea",
template: "{area}/{controller=Home}/{action=Index}/{id?}");
routes.MapRoute(
name: "default",
template: "{controller=Home}/{action=Index}/{id?}");
});
SeedDatabase(context); SeedDatabase(context);
} }

11
templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs

@ -87,16 +87,7 @@ namespace MyCompanyName.MyProjectName
app.UseRequestLocalization(app.ApplicationServices.GetRequiredService<IOptions<RequestLocalizationOptions>>().Value); app.UseRequestLocalization(app.ApplicationServices.GetRequiredService<IOptions<RequestLocalizationOptions>>().Value);
app.UseMvc(routes => app.UseMvcWithDefaultRouteAndArea();
{
routes.MapRoute(
name: "defaultWithArea",
template: "{area}/{controller=Home}/{action=Index}/{id?}");
routes.MapRoute(
name: "default",
template: "{controller=Home}/{action=Index}/{id?}");
});
} }
} }
} }
Loading…
Cancel
Save