Browse Source

Resolved resharper warnings.

pull/4135/head
Halil İbrahim Kalkan 6 years ago
parent
commit
57a8701b70
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/Default.cshtml
  2. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml
  3. 8
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
  4. 1
      framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Routing/EndpointRouteBuilderContext.cs
  5. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/LocalizationTestController.cs
  6. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/SimpleController.cs

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/Default.cshtml

@ -4,7 +4,7 @@
<div id="AbpPageAlerts"> <div id="AbpPageAlerts">
@foreach (var alertMessage in Model) @foreach (var alertMessage in Model)
{ {
<abp-alert alert-type="@alertMessage.Type" dismissible="@alertMessage.Dismissible"> <abp-alert alert-type="@(alertMessage.Type)" dismissible="@alertMessage.Dismissible">
@if (alertMessage.Title != null) @if (alertMessage.Title != null)
{ {
<h4>@alertMessage.Title</h4> <h4>@alertMessage.Title</h4>

6
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml

@ -5,9 +5,9 @@
icon="@Model.Icon" icon="@Model.Icon"
id="@Model.Id" id="@Model.Id"
busy-text="@Model.BusyText" busy-text="@Model.BusyText"
icon-type="@Model.IconType" icon-type="@(Model.IconType)"
button-type="@Model.Type" button-type="@(Model.Type)"
size="@Model.Size" size="@(Model.Size)"
disabled="@Model.Disabled" disabled="@Model.Disabled"
class="mx-1" class="mx-1"
/> />

8
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs

@ -170,11 +170,11 @@ namespace Volo.Abp.AspNetCore.Mvc
Configure<AbpEndpointRouterOptions>(options => Configure<AbpEndpointRouterOptions>(options =>
{ {
options.EndpointConfigureActions.Add(context => options.EndpointConfigureActions.Add(endpointContext =>
{ {
context.Endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}"); endpointContext.Endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
context.Endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}"); endpointContext.Endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
context.Endpoints.MapRazorPages(); endpointContext.Endpoints.MapRazorPages();
}); });
}); });
} }

1
framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Routing/EndpointRouteBuilderContext.cs

@ -5,6 +5,7 @@ namespace Microsoft.AspNetCore.Routing
public class EndpointRouteBuilderContext public class EndpointRouteBuilderContext
{ {
public IEndpointRouteBuilder Endpoints { get; } public IEndpointRouteBuilder Endpoints { get; }
public IServiceProvider ScopeServiceProvider { get; } public IServiceProvider ScopeServiceProvider { get; }
public EndpointRouteBuilderContext( public EndpointRouteBuilderContext(

2
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/LocalizationTestController.cs

@ -9,11 +9,13 @@ namespace Volo.Abp.AspNetCore.App
{ {
public IActionResult HelloJohn() public IActionResult HelloJohn()
{ {
// ReSharper disable once Mvc.ViewNotResolved
return View(); return View();
} }
public IActionResult PersonForm() public IActionResult PersonForm()
{ {
// ReSharper disable once Mvc.ViewNotResolved
return View(new PersonModel()); return View(new PersonModel());
} }

2
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/SimpleController.cs

@ -12,11 +12,13 @@ namespace Volo.Abp.AspNetCore.App
public ActionResult About() public ActionResult About()
{ {
// ReSharper disable once Mvc.ViewNotResolved
return View(); return View();
} }
public ActionResult ExceptionOnRazor() public ActionResult ExceptionOnRazor()
{ {
// ReSharper disable once Mvc.ViewNotResolved
return View(); return View();
} }
} }

Loading…
Cancel
Save