Browse Source

Fix build of BidningDemo

Max Katz 2 years ago
parent
commit
6100fc319f

+ 10 - 4
samples/BindingDemo/App.xaml

@@ -2,8 +2,14 @@
     xmlns="https://github.com/avaloniaui" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="BindingDemo.App">
-    <Application.Styles>
-        <FluentTheme />
-        <StyleInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml"/>
-    </Application.Styles>
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Avalonia.Themes.Simple/Accents/BaseLight.xaml"/>
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
+  <Application.Styles>
+    <FluentTheme />
+   </Application.Styles>
 </Application>

+ 2 - 2
src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs

@@ -41,11 +41,11 @@ namespace Avalonia.Markup.Xaml
             bool designMode = false)
             => AvaloniaXamlIlRuntimeCompiler.Load(new RuntimeXamlLoaderDocument(uri, rootInstance, stream),
                 new RuntimeXamlLoaderConfiguration { DesignMode = designMode, LocalAssembly = localAssembly });
-        
+
         /// <summary>
         /// Loads XAML from a stream.
         /// </summary>
-        /// <param name="stream">The stream containing the XAML.</param>
+        /// <param name="document">The stream containing the XAML.</param>
         /// <param name="configuration">Xaml loader configuration.</param>
         /// <returns>The loaded object.</returns>
         public static object Load(RuntimeXamlLoaderDocument document, RuntimeXamlLoaderConfiguration? configuration = null)