diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/Default.cshtml
index fa40f77f14..5bbc5b1ad0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/Default.cshtml
@@ -4,7 +4,7 @@
     <div id="AbpPageAlerts">
         @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)
                 {
                     <h4>@alertMessage.Title</h4>
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml
index 10f2f7ceb2..bd6b1f6bd1 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml
@@ -5,9 +5,9 @@
     icon="@Model.Icon"
     id="@Model.Id"
     busy-text="@Model.BusyText"
-    icon-type="@Model.IconType"
-    button-type="@Model.Type" 
-    size="@Model.Size" 
+    icon-type="@(Model.IconType)"
+    button-type="@(Model.Type)" 
+    size="@(Model.Size)" 
     disabled="@Model.Disabled"
     class="mx-1"
     />
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
index ee81e0a22e..6785cb710b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@@ -170,11 +170,11 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             Configure<AbpEndpointRouterOptions>(options =>
             {
-                options.EndpointConfigureActions.Add(context =>
+                options.EndpointConfigureActions.Add(endpointContext =>
                 {
-                    context.Endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
-                    context.Endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
-                    context.Endpoints.MapRazorPages();
+                    endpointContext.Endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
+                    endpointContext.Endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
+                    endpointContext.Endpoints.MapRazorPages();
                 });
             });
         }
diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Routing/EndpointRouteBuilderContext.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Routing/EndpointRouteBuilderContext.cs
index 80f25d2d38..32735b8c22 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Routing/EndpointRouteBuilderContext.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Routing/EndpointRouteBuilderContext.cs
@@ -5,6 +5,7 @@ namespace Microsoft.AspNetCore.Routing
     public class EndpointRouteBuilderContext
     {
         public IEndpointRouteBuilder Endpoints { get; }
+        
         public IServiceProvider ScopeServiceProvider { get; }
 
         public EndpointRouteBuilderContext(
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/LocalizationTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/LocalizationTestController.cs
index 1a9b6e7de8..1defcf4809 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/LocalizationTestController.cs
+++ b/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()
         {
+            // ReSharper disable once Mvc.ViewNotResolved
             return View();
         }
 
         public IActionResult PersonForm()
         {
+            // ReSharper disable once Mvc.ViewNotResolved
             return View(new PersonModel());
         }
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/SimpleController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/SimpleController.cs
index ffa8322592..38d0fa9ba4 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/SimpleController.cs
+++ b/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()
         {
+            // ReSharper disable once Mvc.ViewNotResolved
             return View();
         }
 
         public ActionResult ExceptionOnRazor()
         {
+            // ReSharper disable once Mvc.ViewNotResolved
             return View();
         }
     }