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

Merge branch 'release/2.1' into dev

This commit is contained in:
Pranav K 2018-04-06 11:01:32 -07:00
parent 8e323a8e1e 5e019bd707
commit feed0fea2c
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
View File

@ -14,6 +14,10 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts
{ {
internal static HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase) internal static HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{ {
// The deps file for the Microsoft.AspNetCore.All shared runtime is authored in a way where it does not say
// it depends on Microsoft.AspNetCore.Mvc even though it does. Explicitly list it so that referencing this runtime causes
// assembly discovery to work correctly.
"Microsoft.AspNetCore.All",
"Microsoft.AspNetCore.Mvc", "Microsoft.AspNetCore.Mvc",
"Microsoft.AspNetCore.Mvc.Abstractions", "Microsoft.AspNetCore.Mvc.Abstractions",
"Microsoft.AspNetCore.Mvc.ApiExplorer", "Microsoft.AspNetCore.Mvc.ApiExplorer",

1
test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
View File

@ -356,6 +356,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts
var additionalAssemblies = new[] var additionalAssemblies = new[]
{ {
// The following assemblies are not reachable from Microsoft.AspNetCore.Mvc // The following assemblies are not reachable from Microsoft.AspNetCore.Mvc
"Microsoft.AspNetCore.All",
"Microsoft.AspNetCore.Mvc.Formatters.Xml", "Microsoft.AspNetCore.Mvc.Formatters.Xml",
}; };