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

Bump Razor to dotnet5.5

This commit is contained in:
Pranav K 2015-11-23 15:31:59 -08:00
parent b6f8c523a8
commit b622a5b0d3
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.4": {} "dotnet5.5": {}
}, },
"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_4 #if DOTNET5_5
using System.Runtime.Loader; using System.Runtime.Loader;
#endif #endif
using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.FileProviders;
@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
private readonly Lazy<List<MetadataReference>> _applicationReferences; private readonly Lazy<List<MetadataReference>> _applicationReferences;
private readonly string _classPrefix; private readonly string _classPrefix;
#if DOTNET5_4 #if DOTNET5_5
private readonly RazorLoadContext _razorLoadContext; private readonly RazorLoadContext _razorLoadContext;
#endif #endif
@ -70,7 +70,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
_fileProvider = optionsAccessor.Value.FileProvider; _fileProvider = optionsAccessor.Value.FileProvider;
_classPrefix = host.MainClassNamePrefix; _classPrefix = host.MainClassNamePrefix;
#if DOTNET5_4 #if DOTNET5_5
_razorLoadContext = new RazorLoadContext(); _razorLoadContext = new RazorLoadContext();
#endif #endif
} }
@ -339,7 +339,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation
return null; return null;
} }
#if DOTNET5_4 #if DOTNET5_5
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

@ -39,7 +39,7 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"dotnet5.4": { "dotnet5.5": {
"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

@ -24,7 +24,7 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "dotnet5.5": {
"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.4": {} "dotnet5.5": {}
} }
} }