From 4a92fadd3404aed55abd4c92aaaa7a7f0025c33c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 4 Dec 2022 12:15:13 +0100 Subject: [PATCH] Fix StyleIncludeTests. Wasn't finding `RelativeSource` type at times. --- src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github | 2 +- .../Xaml/StyleIncludeTests.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github index 5e498f8bcc..491de981dd 160000 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github @@ -1 +1 @@ -Subproject commit 5e498f8bcca403a34aff5efc825cbb4e12b7fa8e +Subproject commit 491de981dd4433ee58bc9540e2cd4a5d168f8168 diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs index d76e51f419..929529e97a 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs +++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleIncludeTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Avalonia.Controls; +using Avalonia.Data; using Avalonia.Markup.Xaml.Styling; using Avalonia.Markup.Xaml.XamlIl.Runtime; using Avalonia.Media; @@ -15,6 +16,11 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml; public class StyleIncludeTests { + public StyleIncludeTests() + { + System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(RelativeSource).TypeHandle); + } + [Fact] public void StyleInclude_Is_Built() {