Remove use of AssemblyLoadContext

This will be needed for the switch back to net46.
aspnet · May 24, 2017 · 6094c6f · 6094c6f
1 parent a6d97d3
commit 6094c6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewManfiest.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewManfiest.cs
@@ -41,7 +41,7 @@ private static void EnsureFeatureAssembly(AssemblyPart assemblyPart)
             {
                 try
                 {
-                    AssemblyLoadContext.Default.LoadFromAssemblyPath(precompiledAssemblyFilePath);
+                    Assembly.LoadFile(precompiledAssemblyFilePath);
                 }
                 catch (FileLoadException)
                 {

diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
@@ -185,7 +185,7 @@ private static bool IsError(Diagnostic diagnostic)
 
         public static Assembly LoadAssembly(MemoryStream assemblyStream, MemoryStream pdbStream)
         {
-            var assembly = AssemblyLoadContext.Default.LoadFromStream(assemblyStream, pdbStream);
+            var assembly = Assembly.Load(assemblyStream.ToArray(), pdbStream.ToArray());
             return assembly;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     try
                     {
-                        AssemblyLoadContext.Default.LoadFromAssemblyPath(precompiledAssemblyFilePath);
+                        Assembly.LoadFile(precompiledAssemblyFilePath);
                     }
                     catch (FileLoadException)
                     {
@@ Expand Down @@