React to System.Runtime.Loader TFM changes
This commit is contained in:
parent
328f4d648b
commit
1144fc0e6c
|
|
@ -17,7 +17,7 @@
|
|||
},
|
||||
"frameworks": {
|
||||
"net451": {},
|
||||
"dotnet5.5": {}
|
||||
"dotnet5.6": {}
|
||||
},
|
||||
"exclude": [
|
||||
"wwwroot",
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using System.IO;
|
|||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Reflection.PortableExecutable;
|
||||
#if DOTNET5_5
|
||||
#if DOTNET5_6
|
||||
using System.Runtime.Loader;
|
||||
#endif
|
||||
using System.Runtime.Versioning;
|
||||
|
|
@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
|
|||
private readonly CSharpCompilationOptions _compilationOptions;
|
||||
private readonly ILogger _logger;
|
||||
|
||||
#if DOTNET5_5
|
||||
#if DOTNET5_6
|
||||
private readonly RazorLoadContext _razorLoadContext;
|
||||
#endif
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
|
|||
_compilationOptions = optionsAccessor.Value.CompilationOptions;
|
||||
_logger = loggerFactory.CreateLogger<RoslynCompilationService>();
|
||||
|
||||
#if DOTNET5_5
|
||||
#if DOTNET5_6
|
||||
_razorLoadContext = new RazorLoadContext();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -292,7 +292,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
|
|||
mappedLineSpan.EndLinePosition.Character + 1);
|
||||
}
|
||||
|
||||
#if DOTNET5_5
|
||||
#if DOTNET5_6
|
||||
private class RazorLoadContext : AssemblyLoadContext
|
||||
{
|
||||
protected override Assembly Load(AssemblyName assemblyName)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
"System.Threading.Tasks": ""
|
||||
}
|
||||
},
|
||||
"dotnet5.5": {
|
||||
"dotnet5.6": {
|
||||
"dependencies": {
|
||||
"System.Text.Encoding": "4.0.11-*",
|
||||
"System.Runtime.Loader": "4.0.0-*",
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
},
|
||||
"frameworks": {
|
||||
"net451": {},
|
||||
"dotnet5.5": {
|
||||
"dotnet5.6": {
|
||||
"dependencies": {
|
||||
"System.Security.Cryptography.Algorithms": "4.0.0-*"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@
|
|||
},
|
||||
"frameworks": {
|
||||
"net451": {},
|
||||
"dotnet5.5": {}
|
||||
"dotnet5.6": {}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue