From e1c7e8b5ecf0d6ef08a4abcfff201ab71b295a2d Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 14 Nov 2022 01:34:46 -0500 Subject: [PATCH] Apply changes after review --- src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs | 5 ++--- src/Avalonia.DesignerSupport/DesignWindowLoader.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs index 83def84989..3493fc06ed 100644 --- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs +++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs @@ -122,10 +122,9 @@ namespace Avalonia.Build.Tasks if (avares.Resources.Count(CheckXamlName) == 0) // Nothing to do return null; - - if (asm.MainModule.TryGetTypeReference("System.Reflection.AssemblyMetadataAttribute", out var asmMetadata)) + if (typeSystem.FindType("System.Reflection.AssemblyMetadataAttribute") is {} asmMetadata) { - var ctor = asm.MainModule.ImportReference(asmMetadata.Resolve() + var ctor = asm.MainModule.ImportReference(typeSystem.GetTypeReference(asmMetadata).Resolve() .GetConstructors().First(c => c.Parameters.Count == 2).Resolve()); var strType = asm.MainModule.ImportReference(typeof(string)); var arg1 = new CustomAttributeArgument(strType, "AvaloniaUseCompiledBindingsByDefault"); diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs index 1e1b550a15..9a901f909a 100644 --- a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs +++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs @@ -43,7 +43,7 @@ namespace Avalonia.DesignerSupport LocalAssembly = localAsm, BaseUri = baseUri, DesignMode = true, - UseCompiledBindingsByDefault = bool.TryParse(useCompiledBindings, out var tempBool) && tempBool + UseCompiledBindingsByDefault = bool.TryParse(useCompiledBindings, out var parsedValue ) && parsedValue }); var style = loaded as IStyle; var resources = loaded as ResourceDictionary;