From 4af78e5aa227daa7793e11c8274705f00304f415 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 12 May 2022 08:11:33 +0200 Subject: [PATCH 1/3] Update GitInfo.txt --- GitInfo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitInfo.txt b/GitInfo.txt index bfe4903151ad..1595e0568dad 100644 --- a/GitInfo.txt +++ b/GitInfo.txt @@ -1 +1 @@ -6.0.300-rc.4 +6.0.300 From b926ce3c1475a6e08e220b26b06c852bf7093fa9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 12 May 2022 09:03:27 +0200 Subject: [PATCH 2/3] No longer make NETSTANDARD == NET6_0 (#7062) --- .nuspec/Microsoft.Maui.Controls.MultiTargeting.targets | 5 ----- src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs | 6 +++--- src/Compatibility/Core/src/RendererToHandlerShim.cs | 2 +- .../Controls/SkiaSharpHandlers/SkiaGraphicsViewHandler.cs | 4 ++-- .../Controls/SkiaSharpHandlers/SkiaShapeViewHandler.cs | 6 +++--- .../samples/Controls.Sample/Maui.Controls.Sample.csproj | 4 ---- src/Controls/src/Core/Interactivity/PlatformBehavior.cs | 2 +- .../src/Core/Platform/PlatformConfigurationExtensions.cs | 4 ++-- src/Controls/src/Core/Platform/PlatformEffect.cs | 2 +- src/Controls/src/Core/Shapes/Shape.cs | 2 +- .../tests/DeviceTests/Elements/PlatformBehaviorTests.cs | 2 +- .../Handlers/ActivityIndicator/ActivityIndicatorHandler.cs | 2 +- .../Handlers/ActivityIndicator/IActivityIndicatorHandler.cs | 2 +- src/Core/src/Handlers/Application/ApplicationHandler.cs | 2 +- src/Core/src/Handlers/Border/BorderHandler.cs | 2 +- src/Core/src/Handlers/Border/IBorderHandler.cs | 2 +- src/Core/src/Handlers/Button/ButtonHandler.cs | 2 +- src/Core/src/Handlers/Button/IButtonHandler.cs | 2 +- src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs | 2 +- src/Core/src/Handlers/CheckBox/ICheckboxHandler.cs | 2 +- src/Core/src/Handlers/ContentView/ContentViewHandler.cs | 2 +- src/Core/src/Handlers/ContentView/IContentViewHandler.cs | 2 +- src/Core/src/Handlers/DatePicker/DatePickerHandler.cs | 2 +- src/Core/src/Handlers/DatePicker/IDatePickerHandler.cs | 2 +- src/Core/src/Handlers/Editor/EditorHandler.cs | 2 +- src/Core/src/Handlers/Editor/IEditorHandler.cs | 2 +- src/Core/src/Handlers/ElementHandlerExtensions.cs | 2 +- src/Core/src/Handlers/Entry/EntryHandler.cs | 2 +- src/Core/src/Handlers/Entry/IEntryHandler.cs | 2 +- src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.cs | 2 +- src/Core/src/Handlers/FlyoutView/IFlyoutViewHandler.cs | 2 +- src/Core/src/Handlers/Image/IImageHandler.cs | 2 +- src/Core/src/Handlers/Image/ImageHandler.cs | 2 +- src/Core/src/Handlers/ImageButton/IImageButtonHandler.cs | 2 +- src/Core/src/Handlers/ImageButton/ImageButtonHandler.cs | 2 +- .../src/Handlers/IndicatorView/IIndicatorViewHandler.cs | 2 +- src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs | 2 +- src/Core/src/Handlers/Label/ILabelHandler.cs | 2 +- src/Core/src/Handlers/Label/LabelHandler.cs | 2 +- src/Core/src/Handlers/Layout/ILayoutHandler.cs | 2 +- src/Core/src/Handlers/Layout/LayoutHandler.cs | 2 +- src/Core/src/Handlers/MenuBar/IMenuBarHandler.cs | 2 +- src/Core/src/Handlers/MenuBar/MenuBarHandler.cs | 2 +- src/Core/src/Handlers/MenuBarItem/IMenuBarItemHandler.cs | 2 +- src/Core/src/Handlers/MenuBarItem/MenuBarItemHandler.cs | 2 +- .../src/Handlers/MenuFlyoutItem/IMenuFlyoutItemHandler.cs | 2 +- .../src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs | 2 +- .../Handlers/MenuFlyoutSubItem/IMenuFlyoutSubItemHandler.cs | 2 +- .../Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs | 2 +- .../src/Handlers/NavigationPage/INavigationViewHandler.cs | 2 +- .../src/Handlers/NavigationPage/NavigationViewHandler.cs | 2 +- src/Core/src/Handlers/Picker/IPickerHandler.cs | 2 +- src/Core/src/Handlers/Picker/PickerHandler.cs | 2 +- src/Core/src/Handlers/ProgressBar/IProgressBarHandler.cs | 2 +- src/Core/src/Handlers/ProgressBar/ProgressBarHandler.cs | 2 +- src/Core/src/Handlers/RadioButton/IRadioButtonHandler.cs | 2 +- src/Core/src/Handlers/RadioButton/RadioButtonHandler.cs | 2 +- src/Core/src/Handlers/RefreshView/IRefreshViewHandler.cs | 2 +- src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs | 2 +- src/Core/src/Handlers/ScrollView/IScrollViewHandler.cs | 2 +- src/Core/src/Handlers/ScrollView/ScrollViewHandler.cs | 2 +- src/Core/src/Handlers/SearchBar/ISearchBarHandler.cs | 2 +- src/Core/src/Handlers/SearchBar/SearchBarHandler.cs | 2 +- src/Core/src/Handlers/ShapeView/IShapeViewHandler.cs | 2 +- src/Core/src/Handlers/ShapeView/ShapeViewHandler.cs | 2 +- src/Core/src/Handlers/Slider/ISliderHandler.cs | 2 +- src/Core/src/Handlers/Slider/SliderHandler.cs | 2 +- src/Core/src/Handlers/Stepper/IStepperHandler.cs | 2 +- src/Core/src/Handlers/Stepper/StepperHandler.cs | 2 +- .../Handlers/SwipeItemMenuItem/ISwipeItemMenuItemHandler.cs | 2 +- .../Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.cs | 2 +- .../src/Handlers/SwipeItemView/ISwipeItemViewHandler.cs | 2 +- src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.cs | 2 +- src/Core/src/Handlers/SwipeView/ISwipeViewHandler.cs | 2 +- src/Core/src/Handlers/SwipeView/SwipeViewHandler.cs | 2 +- src/Core/src/Handlers/Switch/ISwitchHandler.cs | 2 +- src/Core/src/Handlers/Switch/SwitchHandler.cs | 2 +- src/Core/src/Handlers/TabbedView/TabbedViewHandler.cs | 2 +- src/Core/src/Handlers/TimePicker/ITimePickerHandler.cs | 2 +- src/Core/src/Handlers/TimePicker/TimePickerHandler.cs | 2 +- src/Core/src/Handlers/Toolbar/IToolbarHandler.cs | 2 +- src/Core/src/Handlers/Toolbar/ToolbarHandler.cs | 2 +- src/Core/src/Handlers/View/ViewHandler.cs | 4 ++-- src/Core/src/Handlers/View/ViewHandlerOfT.cs | 4 ++-- src/Core/src/Handlers/WebView/IWebViewHandler.cs | 2 +- src/Core/src/Handlers/WebView/WebViewHandler.cs | 2 +- src/Core/src/Handlers/Window/IWindowHandler.cs | 2 +- src/Core/src/Handlers/Window/WindowHandler.cs | 2 +- src/Core/src/ImageSources/ImageSourceExtensions.cs | 2 +- src/Core/src/ImageSources/ImageSourceServiceResult.cs | 2 +- src/Core/src/Platform/ElementExtensions.cs | 2 +- src/Core/src/Platform/ImageSourcePartLoader.cs | 2 +- src/Core/src/Platform/ViewExtensions.cs | 2 +- src/Core/src/PropertyMapper.cs | 2 +- src/Core/src/SemanticExtensions.cs | 2 +- src/Core/src/ViewExtensions.cs | 2 +- src/Core/src/WindowOverlay/WindowOverlay.cs | 2 +- src/Core/tests/DeviceTests/Stubs/StubBaseHandler.cs | 2 +- src/Essentials/src/SecureStorage/SecureStorage.shared.cs | 2 +- src/Essentials/src/Types/Shared/Exceptions.shared.cs | 2 +- src/TestUtils/src/DeviceTests.Runners/TestWindow.cs | 2 +- 101 files changed, 107 insertions(+), 116 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets index a9b30bac85a0..4a61874b157e 100644 --- a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets +++ b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets @@ -79,11 +79,6 @@ $(AndroidProjectFolder)Assets - - - $(DefineConstants);NETSTANDARD - - $(DefineConstants);MONOANDROID diff --git a/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs b/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs index d595c10c2e7b..055c52a411d4 100644 --- a/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs +++ b/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs @@ -46,7 +46,7 @@ public BlazorWebViewHandler(PropertyMapper? mapper) : base(mapper ?? BlazorWebVi /// The . public static void MapHostPage(BlazorWebViewHandler handler, IBlazorWebView webView) { -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) handler.HostPage = webView.HostPage; handler.StartWebViewCoreIfPossible(); #endif @@ -59,13 +59,13 @@ public static void MapHostPage(BlazorWebViewHandler handler, IBlazorWebView webV /// The . public static void MapRootComponents(BlazorWebViewHandler handler, IBlazorWebView webView) { -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) handler.RootComponents = webView.RootComponents; handler.StartWebViewCoreIfPossible(); #endif } -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) private string? HostPage { get; set; } internal void UrlLoading(UrlLoadingEventArgs args) => diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.cs b/src/Compatibility/Core/src/RendererToHandlerShim.cs index 11d9c74384c4..a4355932412a 100644 --- a/src/Compatibility/Core/src/RendererToHandlerShim.cs +++ b/src/Compatibility/Core/src/RendererToHandlerShim.cs @@ -25,7 +25,7 @@ using PlatformView = ElmSharp.EvasObject; using Microsoft.Maui.Controls.Compatibility.Platform.Tizen; using ViewHandler = Microsoft.Maui.Handlers.ViewHandler; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; using ViewHandler = Microsoft.Maui.Handlers.ViewHandler; #elif WINDOWS diff --git a/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaGraphicsViewHandler.cs b/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaGraphicsViewHandler.cs index 1dca399d22f1..e68bc29ac096 100644 --- a/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaGraphicsViewHandler.cs +++ b/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaGraphicsViewHandler.cs @@ -2,7 +2,7 @@ using Microsoft.Maui; using Microsoft.Maui.Handlers; -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) using Microsoft.Maui.Graphics.Skia.Views; #else using SkiaGraphicsView = System.Object; @@ -36,7 +36,7 @@ protected override SkiaGraphicsView CreatePlatformView() public static void MapDrawable(SkiaGraphicsViewHandler handler, IGraphicsView graphicsView) { -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) handler.PlatformView.Drawable = graphicsView.Drawable; #endif } diff --git a/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaShapeViewHandler.cs b/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaShapeViewHandler.cs index 934bede1c977..8af2d51fed57 100644 --- a/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaShapeViewHandler.cs +++ b/src/Controls/samples/Controls.Sample/Controls/SkiaSharpHandlers/SkiaShapeViewHandler.cs @@ -3,7 +3,7 @@ using Microsoft.Maui.Handlers; using Microsoft.Maui.Graphics; -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) using Microsoft.Maui.Graphics.Skia.Views; #else using SkiaGraphicsView = System.Object; @@ -45,7 +45,7 @@ protected override SkiaGraphicsView CreatePlatformView() public static void MapShape(SkiaShapeViewHandler handler, IShapeView shapeView) { -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) handler.PlatformView.Drawable = new ShapeDrawable(shapeView); #endif } @@ -54,7 +54,7 @@ public static void MapShapeProperty(SkiaShapeViewHandler handler, IShapeView sha { #if __IOS__ || __MACCATALYST__ handler.PlatformView.SetNeedsDisplay(); -#elif !NETSTANDARD +#elif !(NETSTANDARD || !PLATFORM) handler.PlatformView.Invalidate(); #endif } diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 48d2e15c2102..0aa03c765173 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -33,10 +33,6 @@ $(DefineConstants);WINDOWS - - $(DefineConstants);NETSTANDARD - - diff --git a/src/Controls/src/Core/Interactivity/PlatformBehavior.cs b/src/Controls/src/Core/Interactivity/PlatformBehavior.cs index e7ae4651028a..72ed87e04cfe 100644 --- a/src/Controls/src/Core/Interactivity/PlatformBehavior.cs +++ b/src/Controls/src/Core/Interactivity/PlatformBehavior.cs @@ -10,7 +10,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NET6_0 || NETSTANDARD +#elif NET6_0 || (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Controls/src/Core/Platform/PlatformConfigurationExtensions.cs b/src/Controls/src/Core/Platform/PlatformConfigurationExtensions.cs index f09c4341ddf4..a0883e8b5de8 100644 --- a/src/Controls/src/Core/Platform/PlatformConfigurationExtensions.cs +++ b/src/Controls/src/Core/Platform/PlatformConfigurationExtensions.cs @@ -6,12 +6,12 @@ using CurrentPlatform = Microsoft.Maui.Controls.PlatformConfiguration.Windows; #elif TIZEN using CurrentPlatform = Microsoft.Maui.Controls.PlatformConfiguration.Tizen; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) namespace Microsoft.Maui.Controls.Platform { public static class PlatformConfigurationExtensions diff --git a/src/Controls/src/Core/Platform/PlatformEffect.cs b/src/Controls/src/Core/Platform/PlatformEffect.cs index ca81a6779452..77af3ccb292c 100644 --- a/src/Controls/src/Core/Platform/PlatformEffect.cs +++ b/src/Controls/src/Core/Platform/PlatformEffect.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Controls/src/Core/Shapes/Shape.cs b/src/Controls/src/Core/Shapes/Shape.cs index e16760b78a53..5397fd282343 100644 --- a/src/Controls/src/Core/Shapes/Shape.cs +++ b/src/Controls/src/Core/Shapes/Shape.cs @@ -182,7 +182,7 @@ PathF IShape.PathForBounds(Graphics.Rect viewBounds) var path = GetPath(); -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) // TODO: not using this.GetPath().Bounds.Size; // since default GetBoundsByFlattening(0.001) returns incorrect results for curves diff --git a/src/Controls/tests/DeviceTests/Elements/PlatformBehaviorTests.cs b/src/Controls/tests/DeviceTests/Elements/PlatformBehaviorTests.cs index c03e1bf82a44..077bd0196714 100644 --- a/src/Controls/tests/DeviceTests/Elements/PlatformBehaviorTests.cs +++ b/src/Controls/tests/DeviceTests/Elements/PlatformBehaviorTests.cs @@ -14,7 +14,7 @@ using PlatformView = Android.Views.View; #elif WINDOWS using PlatformView = Microsoft.UI.Xaml.FrameworkElement; -#elif NET6_0 || NETSTANDARD +#elif NET6_0 || (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs index 5922ecfc0ecb..706f942258ed 100644 --- a/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs +++ b/src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ProgressRing; #elif TIZEN using PlatformView = ElmSharp.ProgressBar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ActivityIndicator/IActivityIndicatorHandler.cs b/src/Core/src/Handlers/ActivityIndicator/IActivityIndicatorHandler.cs index f0bc878d7647..2ac758df6345 100644 --- a/src/Core/src/Handlers/ActivityIndicator/IActivityIndicatorHandler.cs +++ b/src/Core/src/Handlers/ActivityIndicator/IActivityIndicatorHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ProgressRing; #elif TIZEN using PlatformView = ElmSharp.ProgressBar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Application/ApplicationHandler.cs b/src/Core/src/Handlers/Application/ApplicationHandler.cs index dc9b73bef6dc..7635fae11e2d 100644 --- a/src/Core/src/Handlers/Application/ApplicationHandler.cs +++ b/src/Core/src/Handlers/Application/ApplicationHandler.cs @@ -46,7 +46,7 @@ public ApplicationHandler(IPropertyMapper? mapper, CommandMapper? commandMapper) ILogger? Logger => _logger ??= MauiContext?.Services.CreateLogger(); -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) protected override PlatformView CreatePlatformElement() => MauiContext?.Services.GetService() ?? throw new InvalidOperationException($"MauiContext did not have a valid application."); #endif diff --git a/src/Core/src/Handlers/Border/BorderHandler.cs b/src/Core/src/Handlers/Border/BorderHandler.cs index b1685da7898b..0c632dd5ad51 100644 --- a/src/Core/src/Handlers/Border/BorderHandler.cs +++ b/src/Core/src/Handlers/Border/BorderHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.Maui.Platform.ContentPanel; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.BorderView; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Border/IBorderHandler.cs b/src/Core/src/Handlers/Border/IBorderHandler.cs index d6360fe83c97..a7531b142a7d 100644 --- a/src/Core/src/Handlers/Border/IBorderHandler.cs +++ b/src/Core/src/Handlers/Border/IBorderHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.Maui.Platform.ContentPanel; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.BorderView; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Button/ButtonHandler.cs b/src/Core/src/Handlers/Button/ButtonHandler.cs index 06e6a8c5d8c8..de2925522c90 100644 --- a/src/Core/src/Handlers/Button/ButtonHandler.cs +++ b/src/Core/src/Handlers/Button/ButtonHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Button; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Button; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Button/IButtonHandler.cs b/src/Core/src/Handlers/Button/IButtonHandler.cs index 94e7159156a7..d83ef5bc0544 100644 --- a/src/Core/src/Handlers/Button/IButtonHandler.cs +++ b/src/Core/src/Handlers/Button/IButtonHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Button; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Button; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs b/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs index 668efe6c3252..cf9441e84a9f 100644 --- a/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs +++ b/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.CheckBox; #elif TIZEN using PlatformView = ElmSharp.Check; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/CheckBox/ICheckboxHandler.cs b/src/Core/src/Handlers/CheckBox/ICheckboxHandler.cs index 0248931ace75..186a44ea9b48 100644 --- a/src/Core/src/Handlers/CheckBox/ICheckboxHandler.cs +++ b/src/Core/src/Handlers/CheckBox/ICheckboxHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.CheckBox; #elif TIZEN using PlatformView = ElmSharp.Check; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.cs index 7d2c87cf96ad..97a8cf4e1fc5 100644 --- a/src/Core/src/Handlers/ContentView/ContentViewHandler.cs +++ b/src/Core/src/Handlers/ContentView/ContentViewHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.Maui.Platform.ContentPanel; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.ContentCanvas; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ContentView/IContentViewHandler.cs b/src/Core/src/Handlers/ContentView/IContentViewHandler.cs index b4f4b2eb45ae..d4ff01c781ee 100644 --- a/src/Core/src/Handlers/ContentView/IContentViewHandler.cs +++ b/src/Core/src/Handlers/ContentView/IContentViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Platform.ContentPanel; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.ContentCanvas; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.cs index 840ae24b7b61..21986104fd61 100644 --- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.cs +++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.CalendarDatePicker; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/DatePicker/IDatePickerHandler.cs b/src/Core/src/Handlers/DatePicker/IDatePickerHandler.cs index f4c684e4d9cc..d8483ddb4e39 100644 --- a/src/Core/src/Handlers/DatePicker/IDatePickerHandler.cs +++ b/src/Core/src/Handlers/DatePicker/IDatePickerHandler.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.CalendarDatePicker; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Editor/EditorHandler.cs b/src/Core/src/Handlers/Editor/EditorHandler.cs index a82bc9d82cc9..ccf67c103260 100644 --- a/src/Core/src/Handlers/Editor/EditorHandler.cs +++ b/src/Core/src/Handlers/Editor/EditorHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TextBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Editor/IEditorHandler.cs b/src/Core/src/Handlers/Editor/IEditorHandler.cs index a6d52b42b429..5fffb168ac7e 100644 --- a/src/Core/src/Handlers/Editor/IEditorHandler.cs +++ b/src/Core/src/Handlers/Editor/IEditorHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TextBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ElementHandlerExtensions.cs b/src/Core/src/Handlers/ElementHandlerExtensions.cs index 1926db58f0e5..9288667b0619 100644 --- a/src/Core/src/Handlers/ElementHandlerExtensions.cs +++ b/src/Core/src/Handlers/ElementHandlerExtensions.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif using System; diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs index 6b5180a255c2..146d2af3aa9e 100644 --- a/src/Core/src/Handlers/Entry/EntryHandler.cs +++ b/src/Core/src/Handlers/Entry/EntryHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TextBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Entry/IEntryHandler.cs b/src/Core/src/Handlers/Entry/IEntryHandler.cs index 66ed5f171dca..7776469766d0 100644 --- a/src/Core/src/Handlers/Entry/IEntryHandler.cs +++ b/src/Core/src/Handlers/Entry/IEntryHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TextBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.cs b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.cs index 8b4daf5edeba..444f56f1b2d6 100644 --- a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.cs +++ b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.cs @@ -4,7 +4,7 @@ using PlatformView = Android.Views.View; #elif WINDOWS using PlatformView = Microsoft.Maui.Platform.RootNavigationView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/FlyoutView/IFlyoutViewHandler.cs b/src/Core/src/Handlers/FlyoutView/IFlyoutViewHandler.cs index 20a5424e15c0..49ff32ac42d5 100644 --- a/src/Core/src/Handlers/FlyoutView/IFlyoutViewHandler.cs +++ b/src/Core/src/Handlers/FlyoutView/IFlyoutViewHandler.cs @@ -4,7 +4,7 @@ using PlatformView = Android.Views.View; #elif WINDOWS using PlatformView = Microsoft.Maui.Platform.RootNavigationView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Image/IImageHandler.cs b/src/Core/src/Handlers/Image/IImageHandler.cs index fbaddcd8a656..0a4a90823e6f 100644 --- a/src/Core/src/Handlers/Image/IImageHandler.cs +++ b/src/Core/src/Handlers/Image/IImageHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Image; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Image; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Image/ImageHandler.cs b/src/Core/src/Handlers/Image/ImageHandler.cs index f33d6b728533..e0c1b00cfbad 100644 --- a/src/Core/src/Handlers/Image/ImageHandler.cs +++ b/src/Core/src/Handlers/Image/ImageHandler.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Image; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Image; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ImageButton/IImageButtonHandler.cs b/src/Core/src/Handlers/ImageButton/IImageButtonHandler.cs index 881022f741a2..3c7cb181af53 100644 --- a/src/Core/src/Handlers/ImageButton/IImageButtonHandler.cs +++ b/src/Core/src/Handlers/ImageButton/IImageButtonHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Button; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiImageButton; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ImageButton/ImageButtonHandler.cs b/src/Core/src/Handlers/ImageButton/ImageButtonHandler.cs index 25532e407d8e..3e62ef83322f 100644 --- a/src/Core/src/Handlers/ImageButton/ImageButtonHandler.cs +++ b/src/Core/src/Handlers/ImageButton/ImageButtonHandler.cs @@ -15,7 +15,7 @@ using PlatformImage = Tizen.UIExtensions.ElmSharp.Image; using PlatformImageView = Tizen.UIExtensions.ElmSharp.Image; using PlatformView = Microsoft.Maui.Platform.MauiImageButton; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformImage = System.Object; using PlatformImageView = System.Object; using PlatformView = System.Object; diff --git a/src/Core/src/Handlers/IndicatorView/IIndicatorViewHandler.cs b/src/Core/src/Handlers/IndicatorView/IIndicatorViewHandler.cs index 6cffb37e6690..a3b4d2416dc3 100644 --- a/src/Core/src/Handlers/IndicatorView/IIndicatorViewHandler.cs +++ b/src/Core/src/Handlers/IndicatorView/IIndicatorViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Platform.MauiPageControl; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.IndicatorView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs b/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs index aecb2c2a9b59..a0c799d08c7a 100644 --- a/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs +++ b/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.Maui.Platform.MauiPageControl; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.IndicatorView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Label/ILabelHandler.cs b/src/Core/src/Handlers/Label/ILabelHandler.cs index e801efec388d..45402db217a8 100644 --- a/src/Core/src/Handlers/Label/ILabelHandler.cs +++ b/src/Core/src/Handlers/Label/ILabelHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TextBlock; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Label; -#elif NETSTANDARD || (NET6_0 && !IOS && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Label/LabelHandler.cs b/src/Core/src/Handlers/Label/LabelHandler.cs index e1ee2b8e9458..701ed27971d2 100644 --- a/src/Core/src/Handlers/Label/LabelHandler.cs +++ b/src/Core/src/Handlers/Label/LabelHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TextBlock; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Label; -#elif NETSTANDARD || (NET6_0 && !IOS && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Layout/ILayoutHandler.cs b/src/Core/src/Handlers/Layout/ILayoutHandler.cs index bf43bc63d279..abf9e5155bfe 100644 --- a/src/Core/src/Handlers/Layout/ILayoutHandler.cs +++ b/src/Core/src/Handlers/Layout/ILayoutHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Platform.LayoutPanel; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.LayoutCanvas; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.cs b/src/Core/src/Handlers/Layout/LayoutHandler.cs index 1f0c1f21799e..1023b76898a0 100644 --- a/src/Core/src/Handlers/Layout/LayoutHandler.cs +++ b/src/Core/src/Handlers/Layout/LayoutHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.Maui.Platform.LayoutPanel; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.LayoutCanvas; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuBar/IMenuBarHandler.cs b/src/Core/src/Handlers/MenuBar/IMenuBarHandler.cs index 22c7c99bbd35..29ca315c5bc9 100644 --- a/src/Core/src/Handlers/MenuBar/IMenuBarHandler.cs +++ b/src/Core/src/Handlers/MenuBar/IMenuBarHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuBar; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuBar/MenuBarHandler.cs b/src/Core/src/Handlers/MenuBar/MenuBarHandler.cs index f5badf32acc2..1a73a64056fa 100644 --- a/src/Core/src/Handlers/MenuBar/MenuBarHandler.cs +++ b/src/Core/src/Handlers/MenuBar/MenuBarHandler.cs @@ -9,7 +9,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuBar; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuBarItem/IMenuBarItemHandler.cs b/src/Core/src/Handlers/MenuBarItem/IMenuBarItemHandler.cs index 42a47d99fb88..ce212f46d5b1 100644 --- a/src/Core/src/Handlers/MenuBarItem/IMenuBarItemHandler.cs +++ b/src/Core/src/Handlers/MenuBarItem/IMenuBarItemHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuBarItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuBarItem/MenuBarItemHandler.cs b/src/Core/src/Handlers/MenuBarItem/MenuBarItemHandler.cs index 52f27bb8f361..fe9c543e7c1f 100644 --- a/src/Core/src/Handlers/MenuBarItem/MenuBarItemHandler.cs +++ b/src/Core/src/Handlers/MenuBarItem/MenuBarItemHandler.cs @@ -9,7 +9,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuBarItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuFlyoutItem/IMenuFlyoutItemHandler.cs b/src/Core/src/Handlers/MenuFlyoutItem/IMenuFlyoutItemHandler.cs index 00efe52954fb..47bf7c4afd49 100644 --- a/src/Core/src/Handlers/MenuFlyoutItem/IMenuFlyoutItemHandler.cs +++ b/src/Core/src/Handlers/MenuFlyoutItem/IMenuFlyoutItemHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuFlyoutItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs index 893ce8747041..88bcad9fdae5 100644 --- a/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs +++ b/src/Core/src/Handlers/MenuFlyoutItem/MenuFlyoutItemHandler.cs @@ -9,7 +9,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuFlyoutItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/IMenuFlyoutSubItemHandler.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/IMenuFlyoutSubItemHandler.cs index 7dfb3c45c9cf..ce0736f4bbec 100644 --- a/src/Core/src/Handlers/MenuFlyoutSubItem/IMenuFlyoutSubItemHandler.cs +++ b/src/Core/src/Handlers/MenuFlyoutSubItem/IMenuFlyoutSubItemHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuFlyoutSubItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs index b1e0d1bed5cb..c400667ba2f7 100644 --- a/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs +++ b/src/Core/src/Handlers/MenuFlyoutSubItem/MenuFlyoutSubItemHandler.cs @@ -9,7 +9,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.MenuFlyoutSubItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/NavigationPage/INavigationViewHandler.cs b/src/Core/src/Handlers/NavigationPage/INavigationViewHandler.cs index 368d7956722f..6e381a61b5a7 100644 --- a/src/Core/src/Handlers/NavigationPage/INavigationViewHandler.cs +++ b/src/Core/src/Handlers/NavigationPage/INavigationViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Frame; #elif TIZEN using PlatformView = ElmSharp.Naviframe; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs b/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs index fe31c5a285d2..a7178093e394 100644 --- a/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs +++ b/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Frame; #elif TIZEN using PlatformView = ElmSharp.Naviframe; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Picker/IPickerHandler.cs b/src/Core/src/Handlers/Picker/IPickerHandler.cs index ca71249e620e..2e99218d0bb9 100644 --- a/src/Core/src/Handlers/Picker/IPickerHandler.cs +++ b/src/Core/src/Handlers/Picker/IPickerHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ComboBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Picker/PickerHandler.cs b/src/Core/src/Handlers/Picker/PickerHandler.cs index ed86856ea35d..58b82bb912df 100644 --- a/src/Core/src/Handlers/Picker/PickerHandler.cs +++ b/src/Core/src/Handlers/Picker/PickerHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ComboBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ProgressBar/IProgressBarHandler.cs b/src/Core/src/Handlers/ProgressBar/IProgressBarHandler.cs index 5819a63a03e3..1712fe1e619d 100644 --- a/src/Core/src/Handlers/ProgressBar/IProgressBarHandler.cs +++ b/src/Core/src/Handlers/ProgressBar/IProgressBarHandler.cs @@ -4,7 +4,7 @@ using PlatformView = Android.Widget.ProgressBar; #elif WINDOWS using PlatformView = Microsoft.UI.Xaml.Controls.ProgressBar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.cs b/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.cs index 329a9e834742..b5757c0d8e61 100644 --- a/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.cs +++ b/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.cs @@ -5,7 +5,7 @@ using PlatformView = Android.Widget.ProgressBar; #elif WINDOWS using PlatformView = Microsoft.UI.Xaml.Controls.ProgressBar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/RadioButton/IRadioButtonHandler.cs b/src/Core/src/Handlers/RadioButton/IRadioButtonHandler.cs index 52aba450f42d..fb6dbd17ac3b 100644 --- a/src/Core/src/Handlers/RadioButton/IRadioButtonHandler.cs +++ b/src/Core/src/Handlers/RadioButton/IRadioButtonHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.RadioButton; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiRadioButton; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/RadioButton/RadioButtonHandler.cs b/src/Core/src/Handlers/RadioButton/RadioButtonHandler.cs index d01bd2b95f6d..a9bb34f64fea 100644 --- a/src/Core/src/Handlers/RadioButton/RadioButtonHandler.cs +++ b/src/Core/src/Handlers/RadioButton/RadioButtonHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.RadioButton; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiRadioButton; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/RefreshView/IRefreshViewHandler.cs b/src/Core/src/Handlers/RefreshView/IRefreshViewHandler.cs index a03db2b98a8f..46451440c112 100644 --- a/src/Core/src/Handlers/RefreshView/IRefreshViewHandler.cs +++ b/src/Core/src/Handlers/RefreshView/IRefreshViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.RefreshContainer; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs index 5402ded7253f..9f072569d98b 100644 --- a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs +++ b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.RefreshContainer; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ScrollView/IScrollViewHandler.cs b/src/Core/src/Handlers/ScrollView/IScrollViewHandler.cs index babc3dfa45d1..15c9a5cb2d98 100644 --- a/src/Core/src/Handlers/ScrollView/IScrollViewHandler.cs +++ b/src/Core/src/Handlers/ScrollView/IScrollViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ScrollViewer; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.ScrollView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.cs index 25acbe9628be..d26e7d7b6eab 100644 --- a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.cs +++ b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ScrollViewer; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.ScrollView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SearchBar/ISearchBarHandler.cs b/src/Core/src/Handlers/SearchBar/ISearchBarHandler.cs index dbefd33d5ca3..755dd6560e69 100644 --- a/src/Core/src/Handlers/SearchBar/ISearchBarHandler.cs +++ b/src/Core/src/Handlers/SearchBar/ISearchBarHandler.cs @@ -11,7 +11,7 @@ #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.SearchBar; using QueryEditor = Tizen.UIExtensions.ElmSharp.EditfieldEntry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; using QueryEditor = System.Object; #endif diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs index 1de2c7e111eb..e857373d47ad 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.AutoSuggestBox; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.SearchBar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ShapeView/IShapeViewHandler.cs b/src/Core/src/Handlers/ShapeView/IShapeViewHandler.cs index 91e328fefea4..5dc709baa977 100644 --- a/src/Core/src/Handlers/ShapeView/IShapeViewHandler.cs +++ b/src/Core/src/Handlers/ShapeView/IShapeViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Graphics.Win2D.W2DGraphicsView; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiShapeView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/ShapeView/ShapeViewHandler.cs b/src/Core/src/Handlers/ShapeView/ShapeViewHandler.cs index 423bbbb0940b..3f8d666e2da3 100644 --- a/src/Core/src/Handlers/ShapeView/ShapeViewHandler.cs +++ b/src/Core/src/Handlers/ShapeView/ShapeViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Graphics.Win2D.W2DGraphicsView; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiShapeView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Slider/ISliderHandler.cs b/src/Core/src/Handlers/Slider/ISliderHandler.cs index 77bc21bae444..7ae01a8ff75d 100644 --- a/src/Core/src/Handlers/Slider/ISliderHandler.cs +++ b/src/Core/src/Handlers/Slider/ISliderHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Slider; #elif TIZEN using PlatformView = ElmSharp.Slider; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Slider/SliderHandler.cs b/src/Core/src/Handlers/Slider/SliderHandler.cs index 44dfb79097be..4296c33d4fbb 100644 --- a/src/Core/src/Handlers/Slider/SliderHandler.cs +++ b/src/Core/src/Handlers/Slider/SliderHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.Slider; #elif TIZEN using PlatformView = ElmSharp.Slider; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Stepper/IStepperHandler.cs b/src/Core/src/Handlers/Stepper/IStepperHandler.cs index b9c76eda85f9..49bc2b711c43 100644 --- a/src/Core/src/Handlers/Stepper/IStepperHandler.cs +++ b/src/Core/src/Handlers/Stepper/IStepperHandler.cs @@ -4,7 +4,7 @@ using PlatformView = Microsoft.Maui.Platform.MauiStepper; #elif WINDOWS using PlatformView = Microsoft.Maui.Platform.MauiStepper; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Stepper/StepperHandler.cs b/src/Core/src/Handlers/Stepper/StepperHandler.cs index e8c5b62fcdb2..54894bb7758b 100644 --- a/src/Core/src/Handlers/Stepper/StepperHandler.cs +++ b/src/Core/src/Handlers/Stepper/StepperHandler.cs @@ -4,7 +4,7 @@ using PlatformView = Microsoft.Maui.Platform.MauiStepper; #elif WINDOWS using PlatformView = Microsoft.Maui.Platform.MauiStepper; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SwipeItemMenuItem/ISwipeItemMenuItemHandler.cs b/src/Core/src/Handlers/SwipeItemMenuItem/ISwipeItemMenuItemHandler.cs index 9c5cee02e692..39b27aaab002 100644 --- a/src/Core/src/Handlers/SwipeItemMenuItem/ISwipeItemMenuItemHandler.cs +++ b/src/Core/src/Handlers/SwipeItemMenuItem/ISwipeItemMenuItemHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.SwipeItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.cs b/src/Core/src/Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.cs index f029e521916b..c65aeee27310 100644 --- a/src/Core/src/Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.cs +++ b/src/Core/src/Handlers/SwipeItemMenuItem/SwipeItemMenuItemHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.SwipeItem; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SwipeItemView/ISwipeItemViewHandler.cs b/src/Core/src/Handlers/SwipeItemView/ISwipeItemViewHandler.cs index 950b0f48a632..3c5c14b32a05 100644 --- a/src/Core/src/Handlers/SwipeItemView/ISwipeItemViewHandler.cs +++ b/src/Core/src/Handlers/SwipeItemView/ISwipeItemViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.ContentCanvas; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.cs b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.cs index 7809d5726172..e90a2ee8c431 100644 --- a/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.cs +++ b/src/Core/src/Handlers/SwipeItemView/SwipeItemViewHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.ContentCanvas; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SwipeView/ISwipeViewHandler.cs b/src/Core/src/Handlers/SwipeView/ISwipeViewHandler.cs index 66f2b8019994..9180110007dc 100644 --- a/src/Core/src/Handlers/SwipeView/ISwipeViewHandler.cs +++ b/src/Core/src/Handlers/SwipeView/ISwipeViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.SwipeControl; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.cs b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.cs index 4f58823e101b..29718be83fca 100644 --- a/src/Core/src/Handlers/SwipeView/SwipeViewHandler.cs +++ b/src/Core/src/Handlers/SwipeView/SwipeViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.SwipeControl; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Switch/ISwitchHandler.cs b/src/Core/src/Handlers/Switch/ISwitchHandler.cs index 452a9a60926a..a4c46b427760 100644 --- a/src/Core/src/Handlers/Switch/ISwitchHandler.cs +++ b/src/Core/src/Handlers/Switch/ISwitchHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ToggleSwitch; #elif TIZEN using PlatformView = ElmSharp.Check; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Switch/SwitchHandler.cs b/src/Core/src/Handlers/Switch/SwitchHandler.cs index 5c36e2ee1a1f..02d98d7f6a9d 100644 --- a/src/Core/src/Handlers/Switch/SwitchHandler.cs +++ b/src/Core/src/Handlers/Switch/SwitchHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.ToggleSwitch; #elif TIZEN using PlatformView = ElmSharp.Check; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/TabbedView/TabbedViewHandler.cs b/src/Core/src/Handlers/TabbedView/TabbedViewHandler.cs index 61a158216082..528622384500 100644 --- a/src/Core/src/Handlers/TabbedView/TabbedViewHandler.cs +++ b/src/Core/src/Handlers/TabbedView/TabbedViewHandler.cs @@ -9,7 +9,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/TimePicker/ITimePickerHandler.cs b/src/Core/src/Handlers/TimePicker/ITimePickerHandler.cs index 2cb1e4e6b423..488ff9dfde8f 100644 --- a/src/Core/src/Handlers/TimePicker/ITimePickerHandler.cs +++ b/src/Core/src/Handlers/TimePicker/ITimePickerHandler.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TimePicker; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.cs index de97a0fd3f9c..9d39b25653da 100644 --- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.cs +++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.TimePicker; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Entry; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Toolbar/IToolbarHandler.cs b/src/Core/src/Handlers/Toolbar/IToolbarHandler.cs index 8e61d7a48032..d02bae7ddf30 100644 --- a/src/Core/src/Handlers/Toolbar/IToolbarHandler.cs +++ b/src/Core/src/Handlers/Toolbar/IToolbarHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Platform.MauiToolbar; #elif TIZEN using PlatformView =ElmSharp.Toolbar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Toolbar/ToolbarHandler.cs b/src/Core/src/Handlers/Toolbar/ToolbarHandler.cs index 1cc4a0f3e65f..2f06242a82e9 100644 --- a/src/Core/src/Handlers/Toolbar/ToolbarHandler.cs +++ b/src/Core/src/Handlers/Toolbar/ToolbarHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.Maui.Platform.MauiToolbar; #elif TIZEN using PlatformView =ElmSharp.Toolbar; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs index 8cef6ba4f287..494fa3e43e5d 100644 --- a/src/Core/src/Handlers/View/ViewHandler.cs +++ b/src/Core/src/Handlers/View/ViewHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif @@ -131,7 +131,7 @@ public override void SetVirtualView(IElement element) } #endif -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) private protected abstract void OnConnectHandler(PlatformView platformView); partial void ConnectingHandler(PlatformView? platformView); diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.cs index 26c1b90ab9ee..72ebcd655d5d 100644 --- a/src/Core/src/Handlers/View/ViewHandlerOfT.cs +++ b/src/Core/src/Handlers/View/ViewHandlerOfT.cs @@ -7,7 +7,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif @@ -15,7 +15,7 @@ namespace Microsoft.Maui.Handlers { public abstract partial class ViewHandler : ViewHandler, IViewHandler where TVirtualView : class, IView -#if !NETSTANDARD || IOS || ANDROID || WINDOWS || TIZEN +#if !(NETSTANDARD || !PLATFORM) || IOS || ANDROID || WINDOWS || TIZEN where TPlatformView : PlatformView #else where TPlatformView : class diff --git a/src/Core/src/Handlers/WebView/IWebViewHandler.cs b/src/Core/src/Handlers/WebView/IWebViewHandler.cs index a1c83577b154..44df7fc5089a 100644 --- a/src/Core/src/Handlers/WebView/IWebViewHandler.cs +++ b/src/Core/src/Handlers/WebView/IWebViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.WebView2; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiWebView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/WebView/WebViewHandler.cs b/src/Core/src/Handlers/WebView/WebViewHandler.cs index 1aca40419da9..29e93949e03e 100644 --- a/src/Core/src/Handlers/WebView/WebViewHandler.cs +++ b/src/Core/src/Handlers/WebView/WebViewHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Controls.WebView2; #elif TIZEN using PlatformView = Microsoft.Maui.Platform.MauiWebView; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Window/IWindowHandler.cs b/src/Core/src/Handlers/Window/IWindowHandler.cs index 762a0c9d6979..79990384c2bd 100644 --- a/src/Core/src/Handlers/Window/IWindowHandler.cs +++ b/src/Core/src/Handlers/Window/IWindowHandler.cs @@ -6,7 +6,7 @@ using PlatformView = Microsoft.UI.Xaml.Window; #elif TIZEN using PlatformView = ElmSharp.Window; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Handlers/Window/WindowHandler.cs b/src/Core/src/Handlers/Window/WindowHandler.cs index 6781f370c811..7b9cbbdd229f 100644 --- a/src/Core/src/Handlers/Window/WindowHandler.cs +++ b/src/Core/src/Handlers/Window/WindowHandler.cs @@ -49,7 +49,7 @@ public WindowHandler(IPropertyMapper? mapper = null, CommandMapper? commandMappe { } -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) protected override PlatformView CreatePlatformElement() => MauiContext?.Services.GetService() ?? throw new InvalidOperationException($"MauiContext did not have a valid window."); #endif diff --git a/src/Core/src/ImageSources/ImageSourceExtensions.cs b/src/Core/src/ImageSources/ImageSourceExtensions.cs index 0a8a863a4604..ef8244028dd1 100644 --- a/src/Core/src/ImageSources/ImageSourceExtensions.cs +++ b/src/Core/src/ImageSources/ImageSourceExtensions.cs @@ -12,7 +12,7 @@ using PlatformImage = Microsoft.UI.Xaml.Media.ImageSource; #elif TIZEN using PlatformImage = Tizen.UIExtensions.ElmSharp.Image; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformImage = System.Object; #endif diff --git a/src/Core/src/ImageSources/ImageSourceServiceResult.cs b/src/Core/src/ImageSources/ImageSourceServiceResult.cs index f85a6ec541f0..34a1e7a5ddd6 100644 --- a/src/Core/src/ImageSources/ImageSourceServiceResult.cs +++ b/src/Core/src/ImageSources/ImageSourceServiceResult.cs @@ -8,7 +8,7 @@ using PlatformView = Microsoft.UI.Xaml.Media.ImageSource; #elif TIZEN using PlatformView = Tizen.UIExtensions.ElmSharp.Image; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; #endif diff --git a/src/Core/src/Platform/ElementExtensions.cs b/src/Core/src/Platform/ElementExtensions.cs index c39b7ca5a4cf..cb9d280a2248 100644 --- a/src/Core/src/Platform/ElementExtensions.cs +++ b/src/Core/src/Platform/ElementExtensions.cs @@ -20,7 +20,7 @@ using BasePlatformType = System.Object; using PlatformWindow = ElmSharp.Window; using PlatformApplication = Tizen.Applications.CoreUIApplication; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformView = System.Object; using BasePlatformType = System.Object; using IPlatformViewHandler = Microsoft.Maui.IViewHandler; diff --git a/src/Core/src/Platform/ImageSourcePartLoader.cs b/src/Core/src/Platform/ImageSourcePartLoader.cs index 98359ed6968b..befcd05904f6 100644 --- a/src/Core/src/Platform/ImageSourcePartLoader.cs +++ b/src/Core/src/Platform/ImageSourcePartLoader.cs @@ -14,7 +14,7 @@ #elif TIZEN using PlatformImage = Tizen.UIExtensions.ElmSharp.Image; using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using PlatformImage = System.Object; using PlatformView = System.Object; #endif diff --git a/src/Core/src/Platform/ViewExtensions.cs b/src/Core/src/Platform/ViewExtensions.cs index 53408473dd44..f57f5400dfdb 100644 --- a/src/Core/src/Platform/ViewExtensions.cs +++ b/src/Core/src/Platform/ViewExtensions.cs @@ -5,7 +5,7 @@ using Microsoft.Maui.Media; using System.IO; -#if NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#if (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using IPlatformViewHandler = Microsoft.Maui.IViewHandler; #endif #if IOS || MACCATALYST diff --git a/src/Core/src/PropertyMapper.cs b/src/Core/src/PropertyMapper.cs index 1843a3640b00..139b6261e825 100644 --- a/src/Core/src/PropertyMapper.cs +++ b/src/Core/src/PropertyMapper.cs @@ -7,7 +7,7 @@ using PlatformView = Android.Views.View; #elif WINDOWS using PlatformView = Microsoft.UI.Xaml.FrameworkElement; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif diff --git a/src/Core/src/SemanticExtensions.cs b/src/Core/src/SemanticExtensions.cs index e66534e5b5cf..6eaf2fe47298 100644 --- a/src/Core/src/SemanticExtensions.cs +++ b/src/Core/src/SemanticExtensions.cs @@ -13,7 +13,7 @@ using ElmSharp; using ElmSharp.Accessible; using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/src/ViewExtensions.cs b/src/Core/src/ViewExtensions.cs index 8e40698967f6..d1e024b1df20 100644 --- a/src/Core/src/ViewExtensions.cs +++ b/src/Core/src/ViewExtensions.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.Maui.Media; using System.IO; -#if NETSTANDARD || (NET6_0 && !IOS && !ANDROID && !TIZEN) +#if (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID && !TIZEN) using IPlatformViewHandler = Microsoft.Maui.IViewHandler; #endif #if IOS || MACCATALYST diff --git a/src/Core/src/WindowOverlay/WindowOverlay.cs b/src/Core/src/WindowOverlay/WindowOverlay.cs index 03d6524a195d..aeef6094c979 100644 --- a/src/Core/src/WindowOverlay/WindowOverlay.cs +++ b/src/Core/src/WindowOverlay/WindowOverlay.cs @@ -11,7 +11,7 @@ using PlatformView = Microsoft.UI.Xaml.FrameworkElement; #elif TIZEN using PlatformView = ElmSharp.EvasObject; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Core/tests/DeviceTests/Stubs/StubBaseHandler.cs b/src/Core/tests/DeviceTests/Stubs/StubBaseHandler.cs index 086d3e9abf2a..ef87b16dead4 100644 --- a/src/Core/tests/DeviceTests/Stubs/StubBaseHandler.cs +++ b/src/Core/tests/DeviceTests/Stubs/StubBaseHandler.cs @@ -7,7 +7,7 @@ using PlatformView = Android.Views.View; #elif WINDOWS using PlatformView = Microsoft.UI.Xaml.FrameworkElement; -#elif NETSTANDARD +#elif (NETSTANDARD || !PLATFORM) using PlatformView = System.Object; #endif diff --git a/src/Essentials/src/SecureStorage/SecureStorage.shared.cs b/src/Essentials/src/SecureStorage/SecureStorage.shared.cs index c555997a4802..2ef156dd59d2 100644 --- a/src/Essentials/src/SecureStorage/SecureStorage.shared.cs +++ b/src/Essentials/src/SecureStorage/SecureStorage.shared.cs @@ -97,7 +97,7 @@ public static Task SetAsync(this ISecureStorage secureStorage, string key, strin partial class SecureStorageImplementation { -#if !NETSTANDARD +#if !(NETSTANDARD || !PLATFORM) // Special Alias that is only used for Secure Storage. All others should use: Preferences.GetPrivatePreferencesSharedName internal static readonly string Alias = Preferences.GetPrivatePreferencesSharedName("preferences"); #endif diff --git a/src/Essentials/src/Types/Shared/Exceptions.shared.cs b/src/Essentials/src/Types/Shared/Exceptions.shared.cs index bf67e1dd17d5..3788a8a42854 100644 --- a/src/Essentials/src/Types/Shared/Exceptions.shared.cs +++ b/src/Essentials/src/Types/Shared/Exceptions.shared.cs @@ -4,7 +4,7 @@ namespace Microsoft.Maui.ApplicationModel { static class ExceptionUtils { -#if NETSTANDARD || NET6_0 +#if (NETSTANDARD || !PLATFORM) || NET6_0 internal static NotImplementedInReferenceAssemblyException NotSupportedOrImplementedException => new NotImplementedInReferenceAssemblyException(); #else diff --git a/src/TestUtils/src/DeviceTests.Runners/TestWindow.cs b/src/TestUtils/src/DeviceTests.Runners/TestWindow.cs index 53b4ded37a26..fda433e8c482 100644 --- a/src/TestUtils/src/DeviceTests.Runners/TestWindow.cs +++ b/src/TestUtils/src/DeviceTests.Runners/TestWindow.cs @@ -10,7 +10,7 @@ using PlatformView = Android.App.Activity; #elif WINDOWS using PlatformView = Microsoft.UI.Xaml.Window; -#elif NETSTANDARD || (NET6_0 && !IOS && !ANDROID) +#elif (NETSTANDARD || !PLATFORM) || (NET6_0 && !IOS && !ANDROID) using PlatformView = System.Object; #endif From 7dda2c6ef67c74770415b4a3adf1e40943f16e0c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 12 May 2022 09:05:58 +0200 Subject: [PATCH 3/3] Don't directly reference the tizen nuget (#7071) --- .nuspec/Microsoft.Maui.Controls.MultiTargeting.targets | 2 +- src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets index 4a61874b157e..6d16a33ad4ed 100644 --- a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets +++ b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets @@ -127,7 +127,7 @@ - + diff --git a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets index 952172d225e3..512218e9e94b 100644 --- a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets +++ b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets @@ -72,7 +72,6 @@ -