From 8f6107969cdbe487c58b28d4f6ba6620a9fbd542 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sun, 1 Nov 2020 19:16:56 +0300 Subject: [PATCH] Extra checks --- .../AvaloniaXamlIlRuntimeCompiler.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs index c69a651af2..75de1f55ce 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs @@ -139,6 +139,8 @@ namespace Avalonia.Markup.Xaml.XamlIl static void EmitIgnoresAccessCheckToAttribute(AssemblyName assemblyName) { var name = assemblyName.Name; + if(string.IsNullOrWhiteSpace(name)) + return; var key = assemblyName.GetPublicKey(); if (key != null) name += ", PublicKey=" + BitConverter.ToString(key).Replace("-", "").ToUpperInvariant(); @@ -169,7 +171,7 @@ namespace Avalonia.Markup.Xaml.XamlIl { InitializeSre(); - if (localAssembly?.FullName != null) + if (localAssembly?.GetName() != null) EmitIgnoresAccessCheckToAttribute(localAssembly.GetName()); var asm = localAssembly == null ? null : _sreTypeSystem.GetAssembly(localAssembly); var tb = _sreBuilder.DefineType("Builder_" + Guid.NewGuid().ToString("N") + "_" + uri);