diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json index 686f11736fc..4839ba62fd9 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json @@ -18,6 +18,8 @@ "Name": "TabView", "Type": "TabViewPage", "Subcategory": "Layout", + "BadgeUpdateVersionRequired": "DEPRECATED", + "DeprecatedWarning": "Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui", "About": "A control for displaying multiple items in the same space and allows a user to easily switch between them.", "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TabView", "XamlCodeFile": "TabViewXaml.bind", @@ -663,7 +665,7 @@ "CodeFile": "FacebookCode.bind", "Icon": "/SamplePages/Facebook Service/FacebookLogo.png", "BadgeUpdateVersionRequired": "DEPRECATED", - "DeprecatedWarning": "These helpers will be removed in the next release.", + "DeprecatedWarning": "The underlying library, winsdkfb, which the FacebookService relies on is not currently maintained.", "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/services/Facebook.md" }, { @@ -1095,6 +1097,8 @@ { "Name": "RadialGradientBrush", "Type": "RadialGradientBrushPage", + "BadgeUpdateVersionRequired": "DEPRECATED", + "DeprecatedWarning": "Please migrate to the RadialGradientBrush control from WinUI, this control will be removed in a future release. https://aka.ms/winui", "About": "A composition brush which creates a radial gradient effect.", "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs", "XamlCodeFile": "RadialGradientBrushXaml.bind", diff --git a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs index 39b11fddb6d..20ba5566eef 100644 --- a/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs +++ b/Microsoft.Toolkit.Uwp.Services/Services/Facebook/FacebookService.cs @@ -21,6 +21,7 @@ namespace Microsoft.Toolkit.Uwp.Services.Facebook /// /// Class for connecting to Facebook. /// + [Obsolete("The underlying library, winsdkfb, which the FacebookService relies on is not currently maintained.")] public class FacebookService { /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs index a438fcd4fa5..0e86ab398f5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls/TabView/TabView.cs @@ -17,6 +17,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls /// /// TabView is a control for displaying a set of tabs and their content. /// + [Obsolete("Please migrate to the TabView control from WinUI, this control will be removed in a future release. https://aka.ms/winui")] [TemplatePart(Name = TabContentPresenterName, Type = typeof(ContentPresenter))] [TemplatePart(Name = TabViewContainerName, Type = typeof(Grid))] [TemplatePart(Name = TabsItemsPresenterName, Type = typeof(ItemsPresenter))] diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs b/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs index 71cd7f960b1..0e2f693e72a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs +++ b/Microsoft.Toolkit.Uwp.UI.Media/Brushes/RadialGradientBrush.cs @@ -4,6 +4,7 @@ //// UWP Replacement for WPF RadialGradientBrush: https://msdn.microsoft.com/en-us/library/system.windows.media.radialgradientbrush(v=vs.110).aspx. +using System; using System.Numerics; using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Brushes; @@ -18,6 +19,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Media /// RadialGradientBrush - This GradientBrush defines its Gradient as an interpolation /// within an Ellipse. /// + [Obsolete("Please migrate to the RadialGradientBrush control from WinUI, this control will be removed in a future release. https://aka.ms/winui")] [ContentProperty(Name = nameof(GradientStops))] public partial class RadialGradientBrush : CanvasBrushBase { diff --git a/Microsoft.Toolkit/Helpers/Singleton.cs b/Microsoft.Toolkit/Helpers/Singleton.cs index 3e0291814a3..63bd7044005 100644 --- a/Microsoft.Toolkit/Helpers/Singleton.cs +++ b/Microsoft.Toolkit/Helpers/Singleton.cs @@ -8,23 +8,20 @@ namespace Microsoft.Toolkit.Helpers { /// - /// Provides an easy-to-use thread-safe Singleton Pattern via ConcurrentDictionary. + /// Obsolete see https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3134. /// /// The type to be used for creating the Singleton instance. /// - /// Use by adding a static property to your class for a traditional access pattern: + /// Instead of this helper, migrate your code to this pattern instead: /// /// // Setup Singleton - /// public static class MyClass { - /// public static MyClass Instance => Singleton<MyClass>.Instance; - /// - /// public void MyMethod() { } + /// public class MyClass + /// { + /// public static MyClass Instance { get; } = new MyClass(); /// } - /// - /// // Use Singleton Instance - /// MyClass.Instance.MyMethod(); /// /// + [Obsolete("This helper will be removed in a future release, see example tag for code replacement. https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/3134")] public static class Singleton where T : new() {