Browse Source

Extra checks

pull/4985/head
Nikita Tsukanov 6 years ago
parent
commit
8f6107969c
  1. 4
      src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs

4
src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs

@ -139,6 +139,8 @@ namespace Avalonia.Markup.Xaml.XamlIl
static void EmitIgnoresAccessCheckToAttribute(AssemblyName assemblyName) static void EmitIgnoresAccessCheckToAttribute(AssemblyName assemblyName)
{ {
var name = assemblyName.Name; var name = assemblyName.Name;
if(string.IsNullOrWhiteSpace(name))
return;
var key = assemblyName.GetPublicKey(); var key = assemblyName.GetPublicKey();
if (key != null) if (key != null)
name += ", PublicKey=" + BitConverter.ToString(key).Replace("-", "").ToUpperInvariant(); name += ", PublicKey=" + BitConverter.ToString(key).Replace("-", "").ToUpperInvariant();
@ -169,7 +171,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
{ {
InitializeSre(); InitializeSre();
if (localAssembly?.FullName != null) if (localAssembly?.GetName() != null)
EmitIgnoresAccessCheckToAttribute(localAssembly.GetName()); EmitIgnoresAccessCheckToAttribute(localAssembly.GetName());
var asm = localAssembly == null ? null : _sreTypeSystem.GetAssembly(localAssembly); var asm = localAssembly == null ? null : _sreTypeSystem.GetAssembly(localAssembly);
var tb = _sreBuilder.DefineType("Builder_" + Guid.NewGuid().ToString("N") + "_" + uri); var tb = _sreBuilder.DefineType("Builder_" + Guid.NewGuid().ToString("N") + "_" + uri);

Loading…
Cancel
Save