From 05e0d5cabb818b23e2fc51308db00b41cc2d2cc7 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Tue, 4 Mar 2014 22:59:48 -0800
Subject: [PATCH] Updated to newer version of roslyn

---
 .../Compilation/RoslynCompilationService.cs           | 11 ++++-------
 src/Microsoft.AspNet.Mvc.Razor/project.json           |  8 ++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
index d36c5592c5..10d1603d84 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
@@ -48,7 +48,9 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
 
             if (!result.Success)
             {
-                var messages = result.Diagnostics.Where(IsError).Select(d => GetCompilationMessage(d));
+                var formatter = new DiagnosticFormatter();
+
+                var messages = result.Diagnostics.Where(IsError).Select(d => GetCompilationMessage(formatter, d));
 
                 return Task.FromResult(CompilationResult.Failed(content, messages));
             }
@@ -61,13 +63,8 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
             return Task.FromResult(CompilationResult.Successful(String.Empty, type));
         }
 
-        private CompilationMessage GetCompilationMessage(Diagnostic diagnostic)
+        private CompilationMessage GetCompilationMessage(DiagnosticFormatter formatter, Diagnostic diagnostic)
         {
-#if NET45
-            var formatter = DiagnosticFormatter.Instance;
-#else
-            var formatter = new DiagnosticFormatter();
-#endif
             return new CompilationMessage(formatter.Format(diagnostic));
         }
 
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 4946557e7d..5a78a1527a 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -9,10 +9,10 @@
     "Microsoft.AspNet.Mvc.ModelBinding" : "",
     "Microsoft.AspNet.Mvc.Rendering" : "",
     "Microsoft.AspNet.Mvc.Razor.Host" : "",
-    "Microsoft.CodeAnalysis" : "0.6.31123.2",
-    "Microsoft.CodeAnalysis.CSharp" : "0.6.31123.2",
-    "System.Reflection.Metadata.Ecma335": "0.6.31123.2",
-    "System.Collections.Immutable" : "1.1.15.0"
+    "Microsoft.CodeAnalysis.Common" : "0.6.4021001-beta",
+    "Microsoft.CodeAnalysis.CSharp" : "0.6.4021001-beta",
+    "System.Reflection.Metadata.Ecma335": "0.6.4021001-beta",
+    "Microsoft.Bcl.Immutable" : "1.1.17-beta"
   },
   "configurations": {
     "net45" : {