From 8c15dba978a28e5ffc1f4bcadb31f9e56e134543 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 24 May 2022 20:30:21 -0400 Subject: [PATCH] Don't use StyleInclude for old simple theme --- samples/BindingDemo/App.xaml | 5 ++--- samples/PlatformSanityChecks/App.xaml | 3 +-- samples/Previewer/App.xaml | 3 +-- samples/VirtualizationDemo/App.xaml | 3 +-- samples/interop/Direct3DInteropSample/App.paml | 3 +-- samples/interop/NativeEmbedSample/App.xaml | 3 +-- src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs | 3 +++ tests/Avalonia.DesignerSupport.TestApp/App.xaml | 4 +--- 8 files changed, 11 insertions(+), 16 deletions(-) create mode 100644 src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs diff --git a/samples/BindingDemo/App.xaml b/samples/BindingDemo/App.xaml index 9260dd280f9..b08a44e2f9c 100644 --- a/samples/BindingDemo/App.xaml +++ b/samples/BindingDemo/App.xaml @@ -3,7 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="BindingDemo.App"> - - + - \ No newline at end of file + diff --git a/samples/PlatformSanityChecks/App.xaml b/samples/PlatformSanityChecks/App.xaml index 25bab6ae35d..817142fefd4 100644 --- a/samples/PlatformSanityChecks/App.xaml +++ b/samples/PlatformSanityChecks/App.xaml @@ -1,6 +1,5 @@ - - + diff --git a/samples/Previewer/App.xaml b/samples/Previewer/App.xaml index 6bae1955af6..aacd5c4c1b8 100644 --- a/samples/Previewer/App.xaml +++ b/samples/Previewer/App.xaml @@ -1,6 +1,5 @@ - - + \ No newline at end of file diff --git a/samples/VirtualizationDemo/App.xaml b/samples/VirtualizationDemo/App.xaml index 3ad1dce7944..c84783b4ef6 100644 --- a/samples/VirtualizationDemo/App.xaml +++ b/samples/VirtualizationDemo/App.xaml @@ -3,7 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="VirtualizationDemo.App"> - - + \ No newline at end of file diff --git a/samples/interop/Direct3DInteropSample/App.paml b/samples/interop/Direct3DInteropSample/App.paml index d9630eef581..b1c2b38d213 100644 --- a/samples/interop/Direct3DInteropSample/App.paml +++ b/samples/interop/Direct3DInteropSample/App.paml @@ -1,6 +1,5 @@ - - + \ No newline at end of file diff --git a/samples/interop/NativeEmbedSample/App.xaml b/samples/interop/NativeEmbedSample/App.xaml index e35ade4087b..5b184ce412e 100644 --- a/samples/interop/NativeEmbedSample/App.xaml +++ b/samples/interop/NativeEmbedSample/App.xaml @@ -2,7 +2,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="NativeEmbedSample.App"> - - + diff --git a/src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs b/src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..36d2b95aca1 --- /dev/null +++ b/src/Avalonia.Themes.Default/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using Avalonia.Metadata; + +[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Themes.Default")] diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml b/tests/Avalonia.DesignerSupport.TestApp/App.xaml index 5a33ffff805..18770f79c05 100644 --- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml +++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml @@ -3,8 +3,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - +