diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.NetStandard.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.crossruntime.cs similarity index 99% rename from src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.NetStandard.cs rename to src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.crossruntime.cs index 05398d871..4451cd95c 100644 --- a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.NetStandard.cs +++ b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.Windows.crossruntime.cs @@ -1,4 +1,4 @@ -#if WINDOWS || WINDOWS_UWP || NET472_OR_GREATER || NETSTANDARD2_0 +#if WINDOWS || WINDOWS_UWP || __SKIA_OR_WASM__ using System; using System.Linq; using System.Threading; diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs index 40f16c3e0..f2c774a64 100644 --- a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs +++ b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.cs @@ -95,15 +95,4 @@ private async Task LoadNativeSplashScreen() SplashScreenContent = splashScreenContent; } } - - -#if !__ANDROID__ && !__IOS__ && !(WINDOWS || WINDOWS_UWP) && !NETSTANDARD2_0 - private static Task GetNativeSplashScreen() - { - return Task.FromResult(null); - } - - public bool SplashIsEnabled => (Platforms & SplashScreenPlatform.All) != 0; -#endif - } diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.macOS.cs b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.macOS.cs new file mode 100644 index 000000000..27386de2c --- /dev/null +++ b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.macOS.cs @@ -0,0 +1,21 @@ +#if !__ANDROID__ && !__IOS__ && !(WINDOWS || WINDOWS_UWP) && !__SKIA_OR_WASM__ + +#if IS_WINUI +using Microsoft.UI.Xaml; +#else +using Windows.UI.Xaml; +#endif +using System.Threading.Tasks; + +namespace Uno.Toolkit.UI; + +public partial class ExtendedSplashScreen +{ + private static Task GetNativeSplashScreen() + { + return Task.FromResult(null); + } + + public bool SplashIsEnabled => (Platforms & SplashScreenPlatform.All) != 0; +} +#endif diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj index 397bf600b..463d0ebb3 100644 --- a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj +++ b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj @@ -18,6 +18,11 @@ true + + + $(DefineConstants);__SKIA_OR_WASM__ + + diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj index 92c6b5457..e8b81cc03 100644 --- a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj +++ b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj @@ -18,6 +18,11 @@ true + + + $(DefineConstants);__SKIA_OR_WASM__ + +