Browse Source

Apply changes after review

pull/7247/head
Max Katz 4 years ago
parent
commit
e1c7e8b5ec
  1. 5
      src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
  2. 2
      src/Avalonia.DesignerSupport/DesignWindowLoader.cs

5
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");

2
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;

Loading…
Cancel
Save