From dbd6a4396bd2e17de3a8a56a3ee132e55985510e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Filip?= <34779382+tomasfil@users.noreply.github.com> Date: Mon, 27 Jun 2022 19:43:36 +0200 Subject: [PATCH] Fix registration outside of SharedLibraries (#927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix * remove net5.0 condition Co-authored-by: Tomáš Filip --- src/Directory.build.targets | 3 +++ .../Platforms/ServiceLocationDrawingInitialization.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Directory.build.targets b/src/Directory.build.targets index 23d86b2f3..b649ce49d 100644 --- a/src/Directory.build.targets +++ b/src/Directory.build.targets @@ -53,4 +53,7 @@ $(DefineConstants);TIZEN + + $(DefineConstants);IS_SHARED_NET + diff --git a/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs b/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs index db17b2780..c0575f387 100644 --- a/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs +++ b/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs @@ -23,7 +23,7 @@ public static void RegisterPlatformBitmapLoader(this IMutableDependencyResolver throw new ArgumentNullException(nameof(resolver)); } -#if !NETSTANDARD && !NET5_0 && !NET6_0 +#if !IS_SHARED_NET // not supported in netstandard2.0 or NET5/6 library if (!resolver.HasRegistration(typeof(IBitmapLoader))) {