huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to System.Runtime.Loader TFM changes

This commit is contained in:
Pranav K 2016-01-20 16:02:10 -08:00
parent 328f4d648b
commit 1144fc0e6c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Mvc.Localization/project.json
View File

@ -17,7 +17,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.5": {} "dotnet5.6": {}
}, },
"exclude": [ "exclude": [
"wwwroot", "wwwroot",

8
src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
View File

@ -9,7 +9,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Reflection.PortableExecutable; using System.Reflection.PortableExecutable;
#if DOTNET5_5 #if DOTNET5_6
using System.Runtime.Loader; using System.Runtime.Loader;
#endif #endif
using System.Runtime.Versioning; using System.Runtime.Versioning;
@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
private readonly CSharpCompilationOptions _compilationOptions; private readonly CSharpCompilationOptions _compilationOptions;
private readonly ILogger _logger; private readonly ILogger _logger;
#if DOTNET5_5 #if DOTNET5_6
private readonly RazorLoadContext _razorLoadContext; private readonly RazorLoadContext _razorLoadContext;
#endif #endif
@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
_compilationOptions = optionsAccessor.Value.CompilationOptions; _compilationOptions = optionsAccessor.Value.CompilationOptions;
_logger = loggerFactory.CreateLogger<RoslynCompilationService>(); _logger = loggerFactory.CreateLogger<RoslynCompilationService>();
#if DOTNET5_5 #if DOTNET5_6
_razorLoadContext = new RazorLoadContext(); _razorLoadContext = new RazorLoadContext();
#endif #endif
} }
@ -292,7 +292,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
mappedLineSpan.EndLinePosition.Character + 1); mappedLineSpan.EndLinePosition.Character + 1);
} }
#if DOTNET5_5 #if DOTNET5_6
private class RazorLoadContext : AssemblyLoadContext private class RazorLoadContext : AssemblyLoadContext
{ {
protected override Assembly Load(AssemblyName assemblyName) protected override Assembly Load(AssemblyName assemblyName)

2
src/Microsoft.AspNet.Mvc.Razor/project.json
View File

@ -38,7 +38,7 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"dotnet5.5": { "dotnet5.6": {
"dependencies": { "dependencies": {
"System.Text.Encoding": "4.0.11-*", "System.Text.Encoding": "4.0.11-*",
"System.Runtime.Loader": "4.0.0-*", "System.Runtime.Loader": "4.0.0-*",

2
src/Microsoft.AspNet.Mvc.TagHelpers/project.json
View File

@ -29,7 +29,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.5": { "dotnet5.6": {
"dependencies": { "dependencies": {
"System.Security.Cryptography.Algorithms": "4.0.0-*" "System.Security.Cryptography.Algorithms": "4.0.0-*"
} }

2
src/Microsoft.AspNet.Mvc/project.json
View File

@ -26,6 +26,6 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.5": {} "dotnet5.6": {}
} }
} }