From b622a5b0d3ad1f948d97b602bdb0622fdd0b0bfb Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 23 Nov 2015 15:31:59 -0800
Subject: [PATCH] Bump Razor to dotnet5.5

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

diff --git a/src/Microsoft.AspNet.Mvc.Localization/project.json b/src/Microsoft.AspNet.Mvc.Localization/project.json
index 741b4fd03f..cf9d5f734d 100644
--- a/src/Microsoft.AspNet.Mvc.Localization/project.json
+++ b/src/Microsoft.AspNet.Mvc.Localization/project.json
@@ -17,7 +17,7 @@
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {}
+    "dotnet5.5": {}
   },
   "exclude": [
     "wwwroot",
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
index 09b5ae634d..1a9dd35d06 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
@@ -9,7 +9,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.PortableExecutable;
-#if DOTNET5_4
+#if DOTNET5_5
 using System.Runtime.Loader;
 #endif
 using Microsoft.AspNet.FileProviders;
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
         private readonly Lazy<List<MetadataReference>> _applicationReferences;
         private readonly string _classPrefix;
 
-#if DOTNET5_4
+#if DOTNET5_5
         private readonly RazorLoadContext _razorLoadContext;
 #endif
 
@@ -70,7 +70,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
             _fileProvider = optionsAccessor.Value.FileProvider;
             _classPrefix = host.MainClassNamePrefix;
 
-#if DOTNET5_4
+#if DOTNET5_5
             _razorLoadContext = new RazorLoadContext();
 #endif
         }
@@ -339,7 +339,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
             return null;
         }
 
-#if DOTNET5_4
+#if DOTNET5_5
         private class RazorLoadContext : AssemblyLoadContext
         {
             protected override Assembly Load(AssemblyName assemblyName)
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 9de835f5ce..2024a158b6 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -39,7 +39,7 @@
         "System.Threading.Tasks": ""
       }
     },
-    "dotnet5.4": {
+    "dotnet5.5": {
       "dependencies": {
         "System.Text.Encoding": "4.0.11-*",
         "System.Runtime.Loader": "4.0.0-*",
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/project.json b/src/Microsoft.AspNet.Mvc.TagHelpers/project.json
index 8315e85a86..a10984778f 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/project.json
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/project.json
@@ -24,7 +24,7 @@
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {
+    "dotnet5.5": {
       "dependencies": {
         "System.Security.Cryptography.Algorithms": "4.0.0-*"
       }
diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json
index 06c504842f..6d312ba6f6 100644
--- a/src/Microsoft.AspNet.Mvc/project.json
+++ b/src/Microsoft.AspNet.Mvc/project.json
@@ -26,6 +26,6 @@
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {}
+    "dotnet5.5": {}
   }
 }
\ No newline at end of file