From 59a149457bf8c9afa32c41c9e4ff033184e4abac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 13 Mar 2020 17:35:59 +0300
Subject: [PATCH] Fixed #3117: Physical razor files are not overridding the
 virtual files

---
 .../AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs  | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

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 06ce49551b..21a675ddc4 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
@@ -43,21 +43,6 @@ namespace Volo.Abp.AspNetCore.Mvc
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            //Configure Razor
-            context.Services.Insert(0,
-                ServiceDescriptor.Singleton<IConfigureOptions<MvcRazorRuntimeCompilationOptions>>(
-                    new ConfigureOptions<MvcRazorRuntimeCompilationOptions>(options =>
-                        {
-                            options.FileProviders.Add(
-                                new RazorViewEngineVirtualFileProvider(
-                                    context.Services.GetSingletonInstance<IObjectAccessor<IServiceProvider>>()
-                                )
-                            );
-                        }
-                    )
-                )
-            );
-
             Configure<AbpApiDescriptionModelOptions>(options =>
             {
                 options.IgnoredInterfaces.AddIfNotContains(typeof(IAsyncActionFilter));
@@ -101,7 +86,16 @@ namespace Volo.Abp.AspNetCore.Mvc
                     };
                 })                
                 .AddViewLocalization(); //TODO: How to configure from the application? Also, consider to move to a UI module since APIs does not care about it.
-            
+
+            Configure<MvcRazorRuntimeCompilationOptions>(options =>
+            {
+                options.FileProviders.Add(
+                    new RazorViewEngineVirtualFileProvider(
+                        context.Services.GetSingletonInstance<IObjectAccessor<IServiceProvider>>()
+                    )
+                );
+            });
+
             context.Services.ExecutePreConfiguredActions(mvcBuilder);
 
             //TODO: AddViewLocalization by default..?