From a786eaa9e428102b5b1082afc24f46e6a684b9ea Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Wed, 2 Sep 2015 21:10:43 -0700
Subject: [PATCH] Resolve merge issue

---
 .../MvcRazorMvcBuilderExtensions.cs                | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
index 6e1ca62546..e698b5c4e7 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
@@ -54,5 +54,19 @@ namespace Microsoft.Framework.DependencyInjection
 
             return builder;
         }
+
+        public static IMvcBuilder AddPrecompiledRazorViews(		
+            [NotNull] this IMvcBuilder builder,		
+            [NotNull] params Assembly[] assemblies)		
+        {		
+            builder.Services.Replace(		
+                ServiceDescriptor.Singleton<ICompilerCacheProvider>(serviceProvider =>		
+                    ActivatorUtilities.CreateInstance<PrecompiledViewsCompilerCacheProvider>(		
+                        serviceProvider,		
+                        assemblies.AsEnumerable())));		
+		
+            return builder;		
+        }		
+     }
     }
 }