Fix AssemblyDescriptorResolver assembly matching (#15506)

davidxuang · maxkatz6 · maxkatz6 · commit a377ee03993d · 2024-04-24T23:16:30.000-07:00
* Fix `AssemblyDescriptorResolver` assembly matching

* Update src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs

* Update AssemblyDescriptorResolver.cs

---------

Co-authored-by: Max Katz &lt;maxkatz6@outlook.com&gt;
diff --git a/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs b/src/Avalonia.Base/Platform/Internal/AssemblyDescriptorResolver.cs
@@ -26,7 +26,7 @@ public IAssemblyDescriptor GetAssembly(string name)
         if (!_assemblyNameCache.TryGetValue(name, out var rv))
         {
             var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-            var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);
+            var match = loadedAssemblies.FirstOrDefault(a => name.Equals(a.GetName().Name, StringComparison.InvariantCultureIgnoreCase));
             if (match != null)
             {
                 _assemblyNameCache[name] = rv = new AssemblyDescriptor(match);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public IAssemblyDescriptor GetAssembly(string name)`
`26`	`26`	`if (!_assemblyNameCache.TryGetValue(name, out var rv))`
`27`	`27`	`{`
`28`	`28`	`var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();`
`29`		`- var match = loadedAssemblies.FirstOrDefault(a => a.GetName().Name == name);`
	`29`	`+ var match = loadedAssemblies.FirstOrDefault(a => name.Equals(a.GetName().Name, StringComparison.InvariantCultureIgnoreCase));`
`30`	`30`	`if (match != null)`
`31`	`31`	`{`
`32`	`32`	`_assemblyNameCache[name] = rv = new AssemblyDescriptor(match);`