Skip to content

Commit 2610c6e

Browse files
committed
Assembly name comparison should be case-insensitive. Fixed internal class visibility.
1 parent 6a7c2b3 commit 2610c6e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Dotnet.Script.Core/ScriptAssemblyLoadContext.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ protected ScriptAssemblyLoadContext(bool isCollectible) :
5353
/// </summary>
5454
/// <param name="assemblyName">The assembly name.</param>
5555
/// <returns><c>true</c> if the specified assembly is homogeneous; otherwise, <c>false</c>.</returns>
56-
protected internal virtual bool IsHomogeneousAssembly(AssemblyName assemblyName) =>
57-
assemblyName.Name switch
58-
{
59-
"mscorlib" or
60-
"Microsoft.CodeAnalysis.Scripting" => true,
61-
_ => false
62-
};
56+
protected internal virtual bool IsHomogeneousAssembly(AssemblyName assemblyName)
57+
{
58+
var name = assemblyName.Name;
59+
return
60+
string.Equals(name, "mscorlib", StringComparison.OrdinalIgnoreCase) ||
61+
string.Equals(name, "Microsoft.CodeAnalysis.Scripting", StringComparison.OrdinalIgnoreCase);
62+
}
6363

6464
/// <inheritdoc/>
6565
protected override Assembly? Load(AssemblyName assemblyName) => InvokeLoading(assemblyName);
@@ -70,7 +70,7 @@ protected internal virtual bool IsHomogeneousAssembly(AssemblyName assemblyName)
7070
/// <summary>
7171
/// Provides data for the <see cref="Loading"/> event.
7272
/// </summary>
73-
public sealed class LoadingEventArgs : EventArgs
73+
internal sealed class LoadingEventArgs : EventArgs
7474
{
7575
public LoadingEventArgs(AssemblyName assemblyName)
7676
{

0 commit comments

Comments
 (0)