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

React to deps file casing change 

Fixes #6122
This commit is contained in:
Pranav K 2017-04-13 10:27:01 -07:00
parent dfbf6d43ff
commit c8a1bb6914
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultAssemblyPartDiscoveryProvider.cs
View File

@ -16,20 +16,20 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{
internal static HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{
"microsoft.aspnetcore.mvc",
"microsoft.aspnetcore.mvc.abstractions",
"microsoft.aspnetcore.mvc.apiexplorer",
"microsoft.aspnetcore.mvc.core",
"microsoft.aspnetcore.mvc.cors",
"microsoft.aspnetcore.mvc.dataannotations",
"microsoft.aspnetcore.mvc.formatters.json",
"microsoft.aspnetcore.mvc.formatters.xml",
"microsoft.aspnetcore.mvc.localization",
"microsoft.aspnetcore.mvc.razor",
"microsoft.aspnetcore.mvc.razor.extensions",
"microsoft.aspnetcore.mvc.razorpages",
"microsoft.aspnetcore.mvc.taghelpers",
"microsoft.aspnetcore.mvc.viewfeatures"
"Microsoft.AspNetCore.Mvc",
"Microsoft.AspNetCore.Mvc.Abstractions",
"Microsoft.AspNetCore.Mvc.ApiExplorer",
"Microsoft.AspNetCore.Mvc.Core",
"Microsoft.AspNetCore.Mvc.Cors",
"Microsoft.AspNetCore.Mvc.DataAnnotations",
"Microsoft.AspNetCore.Mvc.Formatters.Json",
"Microsoft.AspNetCore.Mvc.Formatters.Xml",
"Microsoft.AspNetCore.Mvc.Localization",
"Microsoft.AspNetCore.Mvc.Razor",
"Microsoft.AspNetCore.Mvc.Razor.Extensions",
"Microsoft.AspNetCore.Mvc.RazorPages",
"Microsoft.AspNetCore.Mvc.TagHelpers",
"Microsoft.AspNetCore.Mvc.ViewFeatures"
};
public static IEnumerable<ApplicationPart> DiscoverAssemblyParts(string entryPointAssemblyName)

21
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultAssemblyPartDiscoveryProviderTest.cs
View File

@ -229,30 +229,31 @@ namespace Microsoft.AspNetCore.Mvc.Internal
// This test verifies DefaultAssemblyPartDiscoveryProvider.ReferenceAssemblies reflects the actual loadable assemblies
// of the libraries that Microsoft.AspNetCore.Mvc dependes on.
// If we add or remove dependencies, this test should be changed together.
[Fact(Skip = "https://github.com/aspnet/Mvc/issues/6122")]
[Fact]
public void ReferenceAssemblies_ReturnsLoadableReferenceAssemblies()
{
// Arrange
var excludeAssemblies = new string[]
{
"microsoft.aspnetcore.mvc.core.test",
"microsoft.aspnetcore.mvc.testcommon",
"microsoft.aspnetcore.mvc.testdiagnosticlistener",
"microsoft.aspnetcore.mvc.webapicompatshim",
"Microsoft.AspNetCore.Mvc.Core.Test",
"Microsoft.AspNetCore.Mvc.TestCommon",
"Microsoft.AspNetCore.Mvc.TestDiagnosticListener",
"Microsoft.AspNetCore.Mvc.WebApiCompatShim",
};
var additionalAssemblies = new[]
{
// The following assemblies are not reachable from Microsoft.AspNetCore.Mvc
"microsoft.aspnetcore.mvc.taghelpers",
"microsoft.aspnetcore.mvc.formatters.xml",
"Microsoft.AspNetCore.Mvc.Formatters.Xml",
};
var expected = DependencyContext.Load(CurrentAssembly)
var dependencyContextLibraries = DependencyContext.Load(CurrentAssembly)
.RuntimeLibraries
.Where(r => r.Name.StartsWith("microsoft.aspnetcore.mvc", StringComparison.Ordinal) &&
.Where(r => r.Name.StartsWith("Microsoft.AspNetCore.Mvc", StringComparison.Ordinal) &&
!excludeAssemblies.Contains(r.Name, StringComparer.OrdinalIgnoreCase))
.Select(r => r.Name)
.Select(r => r.Name);
var expected = dependencyContextLibraries
.Concat(additionalAssemblies)
.Distinct()
.OrderBy(p => p, StringComparer.Ordinal);