Skip to content

Commit 66d830c

Browse files
committed
Change calls to Assembly.GetName() to use AssemblyNameCache
1 parent 0319f65 commit 66d830c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/WebJobs.Script/Description/DotNet/DirectSharedAssemblyProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System;
55
using System.Reflection;
6+
using Microsoft.Azure.WebJobs.Host;
67

78
namespace Microsoft.Azure.WebJobs.Script.Description
89
{
@@ -17,7 +18,7 @@ public DirectSharedAssemblyProvider(Assembly assembly)
1718

1819
public bool TryResolveAssembly(string assemblyName, out Assembly assembly)
1920
{
20-
if (string.Compare(_assembly.GetName().Name, assemblyName, StringComparison.OrdinalIgnoreCase) == 0)
21+
if (string.Compare(AssemblyNameCache.GetName(_assembly).Name, assemblyName, StringComparison.OrdinalIgnoreCase) == 0)
2122
{
2223
assembly = _assembly;
2324
return true;

src/WebJobs.Script/Description/DotNet/ExtensionSharedAssemblyProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System.Collections.Generic;
55
using System.Reflection;
6+
using Microsoft.Azure.WebJobs.Host;
67
using Microsoft.Azure.WebJobs.Script.Extensibility;
78

89
namespace Microsoft.Azure.WebJobs.Script.Description
@@ -45,7 +46,7 @@ private static bool TryResolveExtensionAssembly(ScriptBindingProvider bindingPro
4546
assembly = null;
4647
Assembly providerAssembly = bindingProvider.GetType().Assembly;
4748

48-
if (string.Compare(assemblyName, providerAssembly.GetName().Name) == 0)
49+
if (string.Compare(assemblyName, AssemblyNameCache.GetName(providerAssembly).Name) == 0)
4950
{
5051
assembly = providerAssembly;
5152
}

src/WebJobs.Script/Utility.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ public static bool TryMatchAssembly(string assemblyName, Type type, out Assembly
348348
matchedAssembly = null;
349349

350350
var candidateAssembly = type.Assembly;
351-
if (string.Compare(assemblyName, candidateAssembly.GetName().Name, StringComparison.OrdinalIgnoreCase) == 0)
351+
if (string.Compare(assemblyName, AssemblyNameCache.GetName(candidateAssembly).Name, StringComparison.OrdinalIgnoreCase) == 0)
352352
{
353353
matchedAssembly = candidateAssembly;
354354
return true;

0 commit comments

Comments
 (0)