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

Use case invariant lookups for DependencyModel to workaround CLI version differences

This commit is contained in:
Pranav K 2017-04-14 17:03:20 -07:00
parent 8fa95d66d4
commit 49628bca2e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,22 +249,22 @@ namespace Microsoft.AspNetCore.Mvc.Internal
var dependencyContextLibraries = DependencyContext.Load(CurrentAssembly) var dependencyContextLibraries = DependencyContext.Load(CurrentAssembly)
.RuntimeLibraries .RuntimeLibraries
.Where(r => r.Name.StartsWith("Microsoft.AspNetCore.Mvc", StringComparison.Ordinal) && .Where(r => r.Name.StartsWith("Microsoft.AspNetCore.Mvc", StringComparison.OrdinalIgnoreCase) &&
!excludeAssemblies.Contains(r.Name, StringComparer.OrdinalIgnoreCase)) !excludeAssemblies.Contains(r.Name, StringComparer.OrdinalIgnoreCase))
.Select(r => r.Name); .Select(r => r.Name);
var expected = dependencyContextLibraries var expected = dependencyContextLibraries
.Concat(additionalAssemblies) .Concat(additionalAssemblies)
.Distinct() .Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(p => p, StringComparer.Ordinal); .OrderBy(p => p, StringComparer.OrdinalIgnoreCase);
// Act // Act
var referenceAssemblies = DefaultAssemblyPartDiscoveryProvider var referenceAssemblies = DefaultAssemblyPartDiscoveryProvider
.ReferenceAssemblies .ReferenceAssemblies
.OrderBy(p => p, StringComparer.Ordinal); .OrderBy(p => p, StringComparer.OrdinalIgnoreCase);
// Assert // Assert
Assert.Equal(expected, referenceAssemblies); Assert.Equal(expected, referenceAssemblies, StringComparer.OrdinalIgnoreCase);
} }
private static RuntimeLibrary GetLibrary(string name, params string[] dependencyNames) private static RuntimeLibrary GetLibrary(string name, params string[] dependencyNames)