From 7c3ca24066e93e11901e28dc7a5ea9cbb8932340 Mon Sep 17 00:00:00 2001 From: Gerald Versluis Date: Fri, 10 Feb 2023 16:02:48 +0100 Subject: [PATCH] Remove TargetIdiom (#13090) * Remove TargetIdiom * Update Device.cs * Fix unshipped txt files --------- Co-authored-by: Rui Marinho --- src/Controls/src/Core/Device.cs | 21 ------------------ .../net-android/PublicAPI.Unshipped.txt | 8 +++++++ .../PublicAPI/net-ios/PublicAPI.Unshipped.txt | 8 +++++++ .../net-maccatalyst/PublicAPI.Unshipped.txt | 8 +++++++ .../net-tizen/PublicAPI.Unshipped.txt | 8 +++++++ .../net-windows/PublicAPI.Unshipped.txt | 8 +++++++ .../PublicAPI/net/PublicAPI.Unshipped.txt | 8 +++++++ .../netstandard/PublicAPI.Unshipped.txt | 8 +++++++ src/Controls/src/Core/TargetIdiom.cs | 22 ------------------- 9 files changed, 56 insertions(+), 43 deletions(-) delete mode 100644 src/Controls/src/Core/TargetIdiom.cs diff --git a/src/Controls/src/Core/Device.cs b/src/Controls/src/Core/Device.cs index 2e5783525627..2bea4df3c3a4 100644 --- a/src/Controls/src/Core/Device.cs +++ b/src/Controls/src/Core/Device.cs @@ -48,27 +48,6 @@ public static class Device [Obsolete("Use Microsoft.Maui.Devices.DevicePlatform.tvOS instead.")] public const string tvOS = "tvOS"; - /// - [Obsolete("Use Microsoft.Maui.Devices.DeviceInfo.Idiom instead.")] - public static TargetIdiom Idiom - { - get - { - var idiom = DeviceInfo.Idiom; - if (idiom == DeviceIdiom.Tablet) - return TargetIdiom.Tablet; - if (idiom == DeviceIdiom.Phone) - return TargetIdiom.Phone; - if (idiom == DeviceIdiom.Desktop) - return TargetIdiom.Desktop; - if (idiom == DeviceIdiom.TV) - return TargetIdiom.TV; - if (idiom == DeviceIdiom.Watch) - return TargetIdiom.Watch; - return TargetIdiom.Unsupported; - } - } - /// [Obsolete("Use Microsoft.Maui.Devices.DeviceInfo.Platform instead.")] public static string RuntimePlatform => DeviceInfo.Platform.ToString(); diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt index 218837ca2448..b045c583c508 100644 --- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt @@ -45,5 +45,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt index bfe73ebeb904..4bd8441bf5c1 100644 --- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt @@ -42,5 +42,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt index bfe73ebeb904..4bd8441bf5c1 100644 --- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt @@ -42,5 +42,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt index 7fc7bdb374db..3e1c895527c1 100644 --- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt @@ -40,5 +40,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt index 1e2360ee9067..703d61a1b16d 100644 --- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt @@ -39,5 +39,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt index b615d03eee31..d8390828b9bc 100644 --- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt @@ -43,5 +43,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt index 286aa4b17784..35205ba0255a 100644 --- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt @@ -37,5 +37,13 @@ override Microsoft.Maui.Controls.SearchBar.IsEnabledCore.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.get -> bool *REMOVED*Microsoft.Maui.Controls.OpenGLView.HasRenderLoop.set -> void *REMOVED*Microsoft.Maui.Controls.OpenGLView.OpenGLView() -> void +*REMOVED*Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Desktop = 3 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Phone = 1 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Tablet = 2 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.TV = 4 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Unsupported = 0 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*Microsoft.Maui.Controls.TargetIdiom.Watch = 5 -> Microsoft.Maui.Controls.TargetIdiom +*REMOVED*static Microsoft.Maui.Controls.Device.Idiom.get -> Microsoft.Maui.Controls.TargetIdiom *REMOVED*Microsoft.Maui.Controls.Application.SavePropertiesAsync() -> System.Threading.Tasks.Task! *REMOVED*Microsoft.Maui.Controls.Application.Properties.get -> System.Collections.Generic.IDictionary! \ No newline at end of file diff --git a/src/Controls/src/Core/TargetIdiom.cs b/src/Controls/src/Core/TargetIdiom.cs deleted file mode 100644 index 9e8e2e581d84..000000000000 --- a/src/Controls/src/Core/TargetIdiom.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace Microsoft.Maui.Controls -{ - /// - [Obsolete("Use Microsoft.Maui.Devices.DeviceIdiom instead.")] - public enum TargetIdiom - { - /// - Unsupported, - /// - Phone, - /// - Tablet, - /// - Desktop, - /// - TV, - /// - Watch - } -}