diff --git a/src/Compilers/Core/VBCSCompiler/AnalyzerConsistencyChecker.cs b/src/Compilers/Core/VBCSCompiler/AnalyzerConsistencyChecker.cs index a586e0a6ebc42bd3dd55aee810e8c3492c5a77ad..2723b4a077daed38d2f416fcd35dfc7d13351919 100644 --- a/src/Compilers/Core/VBCSCompiler/AnalyzerConsistencyChecker.cs +++ b/src/Compilers/Core/VBCSCompiler/AnalyzerConsistencyChecker.cs @@ -12,19 +12,19 @@ namespace Microsoft.CodeAnalysis.CompilerServer { internal static class AnalyzerConsistencyChecker { - private static readonly ImmutableArray s_defaultWhiteList = ImmutableArray.Create("mscorlib", "System", "Microsoft.CodeAnalysis"); + private static readonly ImmutableArray s_defaultIgnorableReferenceNames = ImmutableArray.Create("mscorlib", "System", "Microsoft.CodeAnalysis"); - public static bool Check(string baseDirectory, IEnumerable analyzerReferences, IAnalyzerAssemblyLoader loader, IEnumerable referenceWhiteList = null) + public static bool Check(string baseDirectory, IEnumerable analyzerReferences, IAnalyzerAssemblyLoader loader, IEnumerable ignorableReferenceNames = null) { - if (referenceWhiteList == null) + if (ignorableReferenceNames == null) { - referenceWhiteList = s_defaultWhiteList; + ignorableReferenceNames = s_defaultIgnorableReferenceNames; } try { CompilerServerLogger.Log("Begin Analyzer Consistency Check"); - return CheckCore(baseDirectory, analyzerReferences, loader, referenceWhiteList); + return CheckCore(baseDirectory, analyzerReferences, loader, ignorableReferenceNames); } catch (Exception e) { @@ -37,7 +37,7 @@ public static bool Check(string baseDirectory, IEnumerable analyzerReferences, IAnalyzerAssemblyLoader loader, IEnumerable referenceWhiteList) + private static bool CheckCore(string baseDirectory, IEnumerable analyzerReferences, IAnalyzerAssemblyLoader loader, IEnumerable ignorableReferenceNames) { var resolvedPaths = new List(); @@ -56,14 +56,14 @@ private static bool CheckCore(string baseDirectory, IEnumerable missingDependency.Name.StartsWith(name))) + if (!ignorableReferenceNames.Any(name => missingDependency.Name.StartsWith(name))) { CompilerServerLogger.Log($"Analyzer assembly {resolvedPath} depends on '{missingDependency}' but it was not found."); return false; diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyChecker.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyChecker.cs index e4d0dbcd2935267522f6326567cf17dd20e0e0d4..801d0f3fdf6d0fc3cf2503e7d1860de92442cd3a 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyChecker.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyChecker.cs @@ -17,16 +17,16 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation internal sealed class AnalyzerDependencyChecker { private readonly HashSet _analyzerFilePaths; - private readonly List _assemblyWhiteLists; + private readonly List _ignorableAssemblyLists; private readonly IBindingRedirectionService _bindingRedirectionService; - public AnalyzerDependencyChecker(IEnumerable analyzerFilePaths, IEnumerable assemblyWhiteLists, IBindingRedirectionService bindingRedirectionService = null) + public AnalyzerDependencyChecker(IEnumerable analyzerFilePaths, IEnumerable ignorableAssemblyLists, IBindingRedirectionService bindingRedirectionService = null) { Debug.Assert(analyzerFilePaths != null); - Debug.Assert(assemblyWhiteLists != null); + Debug.Assert(ignorableAssemblyLists != null); _analyzerFilePaths = new HashSet(analyzerFilePaths, StringComparer.OrdinalIgnoreCase); - _assemblyWhiteLists = assemblyWhiteLists.ToList(); + _ignorableAssemblyLists = ignorableAssemblyLists.ToList(); _bindingRedirectionService = bindingRedirectionService; } @@ -46,7 +46,7 @@ public AnalyzerDependencyResults Run(CancellationToken cancellationToken = defau } } - _assemblyWhiteLists.Add(new AssemblyIdentityWhiteList(analyzerInfos.Select(info => info.Identity))); + _ignorableAssemblyLists.Add(new IgnorableAssemblyIdentityList(analyzerInfos.Select(info => info.Identity))); // First check for analyzers with the same identity but different // contents (that is, different MVIDs). @@ -74,7 +74,7 @@ private ImmutableArray FindMissingDependencies(List whiteList.Includes(redirectedReference))) + if (!_ignorableAssemblyLists.Any(ignorableAssemblyList => ignorableAssemblyList.Includes(redirectedReference))) { builder.Add(new MissingAnalyzerDependency( analyzerInfo.Path, diff --git a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs index d72375840ca8f6b53d70d4629722bd4084433cf4..66d6e38b66bf0eec192a0823e4a90a38fa24e04a 100644 --- a/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs +++ b/src/VisualStudio/Core/Def/Implementation/AnalyzerDependencyCheckingService.cs @@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation internal sealed class AnalyzerDependencyCheckingService { private static readonly object s_dependencyConflictErrorId = new object(); - private static readonly IAssemblyWhiteList s_systemPrefixWhiteList = new AssemblyNamePrefixWhiteList("System"); + private static readonly IIgnorableAssemblyList s_systemPrefixList = new IgnorableAssemblyNamePrefixList("System"); private readonly VisualStudioWorkspaceImpl _workspace; private readonly HostDiagnosticUpdateSource _updateSource; @@ -194,10 +194,10 @@ private Task GetConflictsAsync() _task = _task.SafeContinueWith(_ => { IEnumerable loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies().Select(assembly => AssemblyIdentity.FromAssemblyDefinition(assembly)); - AssemblyIdentityWhiteList loadedAssembliesWhiteList = new AssemblyIdentityWhiteList(loadedAssemblies); - IAssemblyWhiteList[] whiteLists = new[] { s_systemPrefixWhiteList, loadedAssembliesWhiteList }; + IgnorableAssemblyIdentityList loadedAssembliesList = new IgnorableAssemblyIdentityList(loadedAssemblies); + IIgnorableAssemblyList[] ignorableAssemblyLists = new[] { s_systemPrefixList, loadedAssembliesList }; - return new AnalyzerDependencyChecker(currentAnalyzerPaths, whiteLists, _bindingRedirectionService).Run(_cancellationTokenSource.Token); + return new AnalyzerDependencyChecker(currentAnalyzerPaths, ignorableAssemblyLists, _bindingRedirectionService).Run(_cancellationTokenSource.Token); }, TaskScheduler.Default); diff --git a/src/VisualStudio/Core/Def/Implementation/IAssemblyWhiteList.cs b/src/VisualStudio/Core/Def/Implementation/IIgnorableAssemblyList.cs similarity index 87% rename from src/VisualStudio/Core/Def/Implementation/IAssemblyWhiteList.cs rename to src/VisualStudio/Core/Def/Implementation/IIgnorableAssemblyList.cs index ef1669089356daff301447d0dd2584f9699a96e4..32c95ea94d848844a27e46028635530375b19b39 100644 --- a/src/VisualStudio/Core/Def/Implementation/IAssemblyWhiteList.cs +++ b/src/VisualStudio/Core/Def/Implementation/IIgnorableAssemblyList.cs @@ -4,7 +4,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation { - internal interface IAssemblyWhiteList + internal interface IIgnorableAssemblyList { bool Includes(AssemblyIdentity assemblyIdentity); } diff --git a/src/VisualStudio/Core/Def/Implementation/AssemblyIdentityWhiteList.cs b/src/VisualStudio/Core/Def/Implementation/IgnorableAssemblyIdentityList.cs similarity index 80% rename from src/VisualStudio/Core/Def/Implementation/AssemblyIdentityWhiteList.cs rename to src/VisualStudio/Core/Def/Implementation/IgnorableAssemblyIdentityList.cs index ac15dcb2cf2a4247cb30dab7ffd6516b63af5fe9..494c521d9ec4a552bc76392dea282200fd7428d0 100644 --- a/src/VisualStudio/Core/Def/Implementation/AssemblyIdentityWhiteList.cs +++ b/src/VisualStudio/Core/Def/Implementation/IgnorableAssemblyIdentityList.cs @@ -6,11 +6,11 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation { - internal sealed class AssemblyIdentityWhiteList : IAssemblyWhiteList + internal sealed class IgnorableAssemblyIdentityList : IIgnorableAssemblyList { private readonly HashSet _assemblyIdentities; - public AssemblyIdentityWhiteList(IEnumerable assemblyIdentities) + public IgnorableAssemblyIdentityList(IEnumerable assemblyIdentities) { Debug.Assert(assemblyIdentities != null); diff --git a/src/VisualStudio/Core/Def/Implementation/AssemblyNamePrefixWhiteList.cs b/src/VisualStudio/Core/Def/Implementation/IgnorableAssemblyNamePrefixList.cs similarity index 80% rename from src/VisualStudio/Core/Def/Implementation/AssemblyNamePrefixWhiteList.cs rename to src/VisualStudio/Core/Def/Implementation/IgnorableAssemblyNamePrefixList.cs index 40c67bbd17204ef43d6b895dd14e379710635e6a..63f3de66e2cab29894297ca2e8e9c16b4e457753 100644 --- a/src/VisualStudio/Core/Def/Implementation/AssemblyNamePrefixWhiteList.cs +++ b/src/VisualStudio/Core/Def/Implementation/IgnorableAssemblyNamePrefixList.cs @@ -5,11 +5,11 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation { - internal sealed class AssemblyNamePrefixWhiteList : IAssemblyWhiteList + internal sealed class IgnorableAssemblyNamePrefixList : IIgnorableAssemblyList { private readonly string _prefix; - public AssemblyNamePrefixWhiteList(string prefix) + public IgnorableAssemblyNamePrefixList(string prefix) { Debug.Assert(prefix != null); diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj index ba8d945901169523e1616db0bba5313d18f887f4..00240ab73678736e5f0b6bc6241f33a038717393 100644 --- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj +++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj @@ -32,12 +32,12 @@ - - + + - + diff --git a/src/VisualStudio/Core/Test/AnalyzerSupport/AnalyzerDependencyCheckerTests.vb b/src/VisualStudio/Core/Test/AnalyzerSupport/AnalyzerDependencyCheckerTests.vb index feb6dc12fc415793ab4a445f3f6f2e0c0f7392c0..fee70931e019959389fd7f6d2fcc78d3676b0579 100644 --- a/src/VisualStudio/Core/Test/AnalyzerSupport/AnalyzerDependencyCheckerTests.vb +++ b/src/VisualStudio/Core/Test/AnalyzerSupport/AnalyzerDependencyCheckerTests.vb @@ -33,11 +33,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests Private Shared s_CSharpCompilerExecutable As String = Path.Combine(MSBuildDirectory, "csc.exe") Private Shared s_mscorlibDisplayName As String = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - Private Shared Function GetWhiteLists() As IEnumerable(Of IAssemblyWhiteList) + Private Shared Function GetIgnorableAssemblyLists() As IEnumerable(Of IIgnorableAssemblyList) Dim mscorlib As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName(s_mscorlibDisplayName, mscorlib) - Return {New AssemblyIdentityWhiteList({mscorlib})} + Return {New IgnorableAssemblyIdentityList({mscorlib})} End Function @@ -48,7 +48,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests Using directory = New DisposableDirectory(Temp) Dim library = BuildLibrary(directory, "public class A { }", "A") - Dim dependencyChecker = New AnalyzerDependencyChecker({library}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({library}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -76,7 +76,7 @@ public class A Dim libraryB = BuildLibrary(directory, sourceB, "B") Dim libraryA = BuildLibrary(directory, sourceA, "A", "B") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -108,7 +108,7 @@ public class A Dim libraryB = BuildLibrary(directory, sourceB, "B") Dim libraryA = BuildLibrary(directory, sourceA, "A", "B", "C") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -149,7 +149,7 @@ public class C Dim libraryD = BuildLibrary(directory, sourceD, "D") Dim libraryC = BuildLibrary(directory, sourceC, "C", "D") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -191,7 +191,7 @@ public class C Dim libraryD = BuildLibrary(directory2, sourceD, "D") Dim libraryC = BuildLibrary(directory2, sourceC, "C", "D") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -232,7 +232,7 @@ public class B Dim libraryA = BuildLibrary(directory, sourceA, "A", "C") Dim libraryB = BuildLibrary(directory, sourceB, "B", "C") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -273,7 +273,7 @@ public class B Dim libraryC2 = directory2.CreateFile("C.dll").CopyContentFrom(libraryC1).Path Dim libraryB = BuildLibrary(directory2, sourceB, "B", "C") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC1, libraryC2}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC1, libraryC2}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.Conflicts) @@ -325,7 +325,7 @@ public class C Dim libraryCPrime = BuildLibrary(directory2, sourceCPrime, "C") Dim libraryB = BuildLibrary(directory2, sourceB, "B", "C") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryCPrime}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryCPrime}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim conflicts = results.Conflicts @@ -396,7 +396,7 @@ public class D Dim libraryA = BuildLibrary(directory1, sourceA, "A", "C") Dim libraryB = BuildLibrary(directory2, sourceB, "B", "C") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC1, libraryC2, libraryD, libraryDPrime}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC1, libraryC2, libraryD, libraryDPrime}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim conflicts = results.Conflicts @@ -475,7 +475,7 @@ public class E Dim libraryA = BuildLibrary(directory1, sourceA, "A", "C") Dim libraryB = BuildLibrary(directory2, sourceB, "B", "D") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD, libraryE, libraryEPrime}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD, libraryE, libraryEPrime}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim conflicts = results.Conflicts @@ -527,7 +527,7 @@ public class B Dim libraryBPrime = BuildLibrary(directory2, sourceBPrime, "B") Dim libraryA2 = directory2.CreateFile("A.dll").CopyContentFrom(libraryA1).Path - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA1, libraryA2, libraryB, libraryBPrime}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA1, libraryA2, libraryB, libraryBPrime}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim conflicts = results.Conflicts @@ -591,7 +591,7 @@ public class B Dim libraryBPrime = BuildLibrary(directory2, sourceBPrime, "B") Dim libraryAPrime = BuildLibrary(directory2, sourceAPrime, "A", "B") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryAPrime, libraryB, libraryBPrime}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryAPrime, libraryB, libraryBPrime}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim conflicts = results.Conflicts @@ -642,7 +642,7 @@ public class B Dim libraryB2 = directory2.CreateFile("B.dll").CopyContentFrom(libraryB1).Path Dim libraryAPrime = BuildLibrary(directory2, sourceAPrime, "A", "B") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryAPrime, libraryB1, libraryB2}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryAPrime, libraryB1, libraryB2}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim conflicts = results.Conflicts @@ -722,7 +722,7 @@ public class D Dim libraryDPrimePrime = BuildLibrary(directory3, sourceDPrimePrime, "D") Dim libraryC = BuildLibrary(directory3, sourceC, "C", "D") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD, libraryDPrime, libraryDPrimePrime}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA, libraryB, libraryC, libraryD, libraryDPrime, libraryDPrimePrime}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Equal(expected:=3, actual:=results.Conflicts.Length) @@ -737,7 +737,7 @@ public class D Using directory = New DisposableDirectory(Temp) Dim library = BuildLibrary(directory, "public class A { }", "A") - Dim dependencyChecker = New AnalyzerDependencyChecker({library}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({library}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Assert.Empty(results.MissingDependencies) @@ -764,7 +764,7 @@ public class A Dim libraryB = BuildLibrary(directory, sourceB, "B") Dim libraryA = BuildLibrary(directory, sourceA, "A", "B") - Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA}, GetWhiteLists()) + Dim dependencyChecker = New AnalyzerDependencyChecker({libraryA}, GetIgnorableAssemblyLists()) Dim results = dependencyChecker.Run() Dim missingDependencies = results.MissingDependencies @@ -777,59 +777,59 @@ public class A End Sub - Public Sub AssemblyIdentityWhiteList_IncludesItem() + Public Sub IgnorableAssemblyIdentityList_IncludesItem() Dim mscorlib1 As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName(s_mscorlibDisplayName, mscorlib1) - Dim whiteList = New AssemblyIdentityWhiteList({mscorlib1}) + Dim ignorableAssemblyList = New IgnorableAssemblyIdentityList({mscorlib1}) Dim mscorlib2 As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName(s_mscorlibDisplayName, mscorlib2) - Assert.True(whiteList.Includes(mscorlib2)) + Assert.True(ignorableAssemblyList.Includes(mscorlib2)) End Sub - Public Sub AssemblyIdentityWhiteList_DoesNotIncludeItem() + Public Sub IgnorableAssemblyIdentityList_DoesNotIncludeItem() Dim mscorlib As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName(s_mscorlibDisplayName, mscorlib) - Dim whiteList = New AssemblyIdentityWhiteList({mscorlib}) + Dim ignorableAssemblyList = New IgnorableAssemblyIdentityList({mscorlib}) Dim alpha As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName("Alpha, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", alpha) - Assert.False(whiteList.Includes(alpha)) + Assert.False(ignorableAssemblyList.Includes(alpha)) End Sub - Public Sub AssemblyNamePrefixWhiteList_IncludesItem_Prefix() - Dim whiteList = New AssemblyNamePrefixWhiteList("Alpha") + Public Sub IgnorableAssemblyNamePrefixList_IncludesItem_Prefix() + Dim ignorableAssemblyList = New IgnorableAssemblyNamePrefixList("Alpha") Dim alphaBeta As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName("Alpha.Beta, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", alphaBeta) - Assert.True(whiteList.Includes(alphaBeta)) + Assert.True(ignorableAssemblyList.Includes(alphaBeta)) End Sub - Public Sub AssemblyNamePrefixWhiteList_IncludesItem_WholeName() - Dim whiteList = New AssemblyNamePrefixWhiteList("Alpha") + Public Sub IgnorableAssemblyNamePrefixList_IncludesItem_WholeName() + Dim ignorableAssemblyList = New IgnorableAssemblyNamePrefixList("Alpha") Dim alpha As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName("Alpha, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", alpha) - Assert.True(whiteList.Includes(alpha)) + Assert.True(ignorableAssemblyList.Includes(alpha)) End Sub - Public Sub AssemblyNamePrefixWhiteList_DoesNotIncludeItem() - Dim whiteList = New AssemblyNamePrefixWhiteList("Beta") + Public Sub IgnorableAssemblyNamePrefixList_DoesNotIncludeItem() + Dim ignorableAssemblyList = New IgnorableAssemblyNamePrefixList("Beta") Dim alpha As AssemblyIdentity = Nothing AssemblyIdentity.TryParseDisplayName("Alpha, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", alpha) - Assert.False(whiteList.Includes(alpha)) + Assert.False(ignorableAssemblyList.Includes(alpha)) End Sub Private Function BuildLibrary(directory As DisposableDirectory, fileContents As String, libraryName As String, ParamArray referenceNames As String()) As String