diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs index 89aaa97405..c139d84ebe 100644 --- a/samples/ControlCatalog/MainView.xaml.cs +++ b/samples/ControlCatalog/MainView.xaml.cs @@ -15,7 +15,7 @@ namespace ControlCatalog { public MainView() { - this.InitializeComponent(); + AvaloniaXamlLoader.Load(this); if (AvaloniaLocator.Current.GetService().GetRuntimeInfo().IsDesktop) { IList tabItems = ((IList)this.FindControl("Sidebar").Items); @@ -60,11 +60,5 @@ namespace ControlCatalog }; Styles.Add(light); } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - AvaloniaXamlIlRuntimeCompiler.DumpRuntimeCompilationResults(); - } } } diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs index df5a587237..61e0046d7e 100644 --- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs +++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs @@ -26,7 +26,7 @@ namespace Avalonia.Markup.Xaml { public bool IsDesignMode { get; set; } - public bool EnforceCompilerForRuntimeXaml { get; set; } = true; + public bool UseLegacyXamlLoader { get; set; } = false; /// /// Initializes a new instance of the class. @@ -162,12 +162,10 @@ namespace Avalonia.Markup.Xaml /// The loaded object. public object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null) { - if (EnforceCompilerForRuntimeXaml) - { + if (!UseLegacyXamlLoader) return AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri); - } - - + + var readerSettings = new XamlXmlReaderSettings() { BaseUri = uri,