From 74bb8288b01c84a1a7396d3936f1fca83a17f946 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 11 Aug 2014 09:49:17 -0700
Subject: [PATCH] Making RoslynCompilationService a singleton.  * Minor code
 cleanup from previous compilation related PR.

---
 .../Compilation/RoslynCompilationService.cs                  | 4 ++--
 .../Razor/RazorCompilationService.cs                         | 3 +--
 src/Microsoft.AspNet.Mvc/MvcServices.cs                      | 5 ++---
 .../Compilation/CompilationResultTest.cs                     | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
index 50d134bc8b..78ca49308c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
     /// </summary>
     public class RoslynCompilationService : ICompilationService
     {
-        private static readonly ConcurrentDictionary<string, MetadataReference> _metadataFileCache =
+        private readonly ConcurrentDictionary<string, MetadataReference> _metadataFileCache =
             new ConcurrentDictionary<string, MetadataReference>(StringComparer.OrdinalIgnoreCase);
 
         private readonly ILibraryManager _libraryManager;
@@ -154,7 +154,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
             return new CompilationMessage(formatter.Format(diagnostic));
         }
 
-        private bool IsError(Diagnostic diagnostic)
+        private static bool IsError(Diagnostic diagnostic)
         {
             return diagnostic.IsWarningAsError || diagnostic.Severity == DiagnosticSeverity.Error;
         }
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
index 9775e34e1e..2b06869907 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
@@ -35,8 +35,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             return _cache.GetOrAdd(file, () => CompileCore(file));
         }
 
-        // TODO: Make this internal
-        public CompilationResult CompileCore(IFileInfo file)
+        internal CompilationResult CompileCore(IFileInfo file)
         {
             GeneratorResults results;
             using (var inputStream = file.CreateReadStream())
diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs
index 5e684c7547..d76c0a0940 100644
--- a/src/Microsoft.AspNet.Mvc/MvcServices.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs
@@ -39,11 +39,10 @@ namespace Microsoft.AspNet.Mvc
 
             yield return describe.Instance<IMvcRazorHost>(new MvcRazorHost(typeof(RazorPage).FullName));
 
-            yield return describe.Transient<ICompilationService, RoslynCompilationService>();
-
+            yield return describe.Singleton<ICompilationService, RoslynCompilationService>();
+            yield return describe.Singleton<IRazorCompilationService, RazorCompilationService>();
             yield return describe.Singleton<IViewEngineProvider, DefaultViewEngineProvider>();
             yield return describe.Scoped<ICompositeViewEngine, CompositeViewEngine>();
-            yield return describe.Singleton<IRazorCompilationService, RazorCompilationService>();
             yield return describe.Singleton<IViewStartProvider, ViewStartProvider>();
 
             yield return describe.Singleton<IRazorPageActivator, RazorPageActivator>();
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
index cdd29a6860..c32c347ce8 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Microsoft.AspNet.FileSystems;