From adb85f9fad7d60b09843824892cd0c9d0eb1cf9e Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 5 Apr 2022 14:39:24 -0400 Subject: [PATCH 1/2] Delete DropDown.cs It wasn't supposed to live for so long. --- src/Avalonia.Controls/DropDown.cs | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 src/Avalonia.Controls/DropDown.cs diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs deleted file mode 100644 index 4e17f5bff5..0000000000 --- a/src/Avalonia.Controls/DropDown.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using Avalonia.Logging; -using Avalonia.Styling; - -namespace Avalonia.Controls -{ - [Obsolete("Use ComboBox")] - public class DropDown : ComboBox, IStyleable - { - public DropDown() - { - Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDown is deprecated: Use ComboBox"); - } - - Type IStyleable.StyleKey => typeof(ComboBox); - } - - [Obsolete("Use ComboBoxItem")] - public class DropDownItem : ComboBoxItem, IStyleable - { - public DropDownItem() - { - Logger.TryGet(LogEventLevel.Warning, LogArea.Control)?.Log(this, "DropDownItem is deprecated: Use ComboBoxItem"); - } - - Type IStyleable.StyleKey => typeof(ComboBoxItem); - } -} From 9f08aee6f63fa28ac811ec08520b20bb0d92e224 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 5 Apr 2022 20:11:39 -0400 Subject: [PATCH 2/2] Update API compat --- src/Avalonia.Controls/ApiCompatBaseline.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt index 6486de132a..12afe71f77 100644 --- a/src/Avalonia.Controls/ApiCompatBaseline.txt +++ b/src/Avalonia.Controls/ApiCompatBaseline.txt @@ -1,4 +1,6 @@ Compat issues with assembly Avalonia.Controls: +TypesMustExist : Type 'Avalonia.Controls.DropDown' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'Avalonia.Controls.DropDownItem' does not exist in the implementation but it does exist in the contract. InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick' is present in the implementation but not in the contract. InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Controls.IMenuItem.StaysOpenOnClick.get()' is present in the implementation but not in the contract. InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.IMenuItem.StaysOpenOnClick.set(System.Boolean)' is present in the implementation but not in the contract. @@ -87,4 +89,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platfor MembersMustExist : Member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size)' does not exist in the implementation but it does exist in the contract. InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.IWindowImpl.Resize(Avalonia.Size, Avalonia.Platform.PlatformResizeReason)' is present in the implementation but not in the contract. InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.ITrayIconImpl Avalonia.Platform.IWindowingPlatform.CreateTrayIcon()' is present in the implementation but not in the contract. -Total Issues: 88 +Total Issues: 90