From 2e6fc861941f635be9ac47be7943472b08c10133 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 30 Nov 2022 02:29:32 -0500 Subject: [PATCH] Make error clear when Source is not set on xaml include (#3788) --- src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs | 3 ++- src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs b/src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs index 01db2c081f..d7eb328715 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs @@ -42,7 +42,8 @@ namespace Avalonia.Markup.Xaml.Styling if (_loaded == null) { _isLoading = true; - _loaded = (IResourceDictionary)AvaloniaXamlLoader.Load(Source, _baseUri); + var source = Source ?? throw new InvalidOperationException("ResourceInclude.Source must be set."); + _loaded = (IResourceDictionary)AvaloniaXamlLoader.Load(source, _baseUri); _isLoading = false; } diff --git a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs index 8af49b5480..2b75e0dd54 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs @@ -51,7 +51,8 @@ namespace Avalonia.Markup.Xaml.Styling if (_loaded == null) { _isLoading = true; - var loaded = (IStyle)AvaloniaXamlLoader.Load(Source, _baseUri); + var source = Source ?? throw new InvalidOperationException("StyleInclude.Source must be set."); + var loaded = (IStyle)AvaloniaXamlLoader.Load(source, _baseUri); _loaded = new[] { loaded }; _isLoading = false; }