From 6a17a29e74c8f804d8c1cd7cbecdb9696d74ab9f Mon Sep 17 00:00:00 2001 From: Cecilia Avila <44245136+ceciliaavila@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:55:03 -0300 Subject: [PATCH] [#6644] Remove BotFrameworkAdapter Obsolete annotation (#6648) * remove obsolete tag * remove extra space --------- Co-authored-by: JhontSouth --- libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs | 4 ++-- .../Microsoft.Bot.Builder/Integration/IAdapterIntegration.cs | 4 +++- .../Streaming/BotFrameworkHttpAdapterBase.cs | 4 +++- .../BotFrameworkHttpAdapter.cs | 4 +++- .../BotMessageHandler.cs | 4 +++- .../BotMessageHandlerBase.cs | 4 +++- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs b/libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs index cc255aef4e..01f2bb53a9 100644 --- a/libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs +++ b/libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs @@ -30,7 +30,8 @@ namespace Microsoft.Bot.Builder /// /// A bot adapter that can connect a bot to a service endpoint. /// - /// The bot adapter encapsulates authentication processes and sends + /// BotFrameworkAdapter is still supported but the recommended adapter is `CloudAdapter`. + /// The bot adapter encapsulates authentication processes and sends /// activities to and receives activities from the Bot Connector Service. When your /// bot receives an activity, the adapter creates a context object, passes it to your /// bot's application logic, and sends responses back to the user's channel. @@ -45,7 +46,6 @@ namespace Microsoft.Bot.Builder /// /// /// h - [Obsolete("Use `CloudAdapter` instead.", false)] public class BotFrameworkAdapter : BotAdapter, IAdapterIntegration, IExtendedUserTokenProvider, IConnectorClientBuilder { private static readonly HttpClient DefaultHttpClient = new HttpClient(); diff --git a/libraries/Microsoft.Bot.Builder/Integration/IAdapterIntegration.cs b/libraries/Microsoft.Bot.Builder/Integration/IAdapterIntegration.cs index 016cbc855b..026c8f7447 100644 --- a/libraries/Microsoft.Bot.Builder/Integration/IAdapterIntegration.cs +++ b/libraries/Microsoft.Bot.Builder/Integration/IAdapterIntegration.cs @@ -11,7 +11,9 @@ namespace Microsoft.Bot.Builder.Integration /// /// An interface that defines the contract between web service integration pieces and the bot adapter. /// - [Obsolete("Use `CloudAdapter` instead to process incoming messages.", false)] + /// + /// BotFrameworkAdapter is still supported but the recommended adapter is `CloudAdapter`. + /// public interface IAdapterIntegration { /// diff --git a/libraries/Microsoft.Bot.Builder/Streaming/BotFrameworkHttpAdapterBase.cs b/libraries/Microsoft.Bot.Builder/Streaming/BotFrameworkHttpAdapterBase.cs index 2815fb5d70..4942a445de 100644 --- a/libraries/Microsoft.Bot.Builder/Streaming/BotFrameworkHttpAdapterBase.cs +++ b/libraries/Microsoft.Bot.Builder/Streaming/BotFrameworkHttpAdapterBase.cs @@ -23,7 +23,9 @@ namespace Microsoft.Bot.Builder.Streaming /// /// An HTTP adapter base class. /// - [Obsolete("Use `CloudAdapter` instead.", false)] + /// + /// BotFrameworkAdapter is still supported but the recommended adapter is `CloudAdapter`. + /// public class BotFrameworkHttpAdapterBase : BotFrameworkAdapter, IStreamingActivityProcessor, IDisposable { private bool _disposedValue; diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotFrameworkHttpAdapter.cs b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotFrameworkHttpAdapter.cs index 13e8ecac4f..ec59d9c799 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotFrameworkHttpAdapter.cs +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotFrameworkHttpAdapter.cs @@ -24,7 +24,9 @@ namespace Microsoft.Bot.Builder.Integration.AspNet.Core /// /// A Bot Builder Adapter implementation used to handled bot Framework HTTP requests. /// - [Obsolete("Use `CloudAdapter` instead.", false)] + /// + /// BotFrameworkAdapter is still supported but the recommended adapter is `CloudAdapter`. + /// public class BotFrameworkHttpAdapter : BotFrameworkHttpAdapterBase, IBotFrameworkHttpAdapter { private const string AuthHeaderName = "authorization"; diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandler.cs b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandler.cs index 5df0b44632..5f987d41f3 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandler.cs +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandler.cs @@ -15,7 +15,9 @@ namespace Microsoft.Bot.Builder.Integration.AspNet.Core.Handlers /// /// A handler to process incoming http requests via using an adapter. /// - [Obsolete("Use `CloudAdapter` instead to process incoming messages.", false)] + /// + /// BotFrameworkAdapter is still supported but the recommended adapter is `CloudAdapter`. + /// public class BotMessageHandler : BotMessageHandlerBase { /// diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandlerBase.cs b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandlerBase.cs index 95d43ee8d9..e9ba107301 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandlerBase.cs +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.Core/BotMessageHandlerBase.cs @@ -17,7 +17,9 @@ namespace Microsoft.Bot.Builder.Integration.AspNet.Core.Handlers /// /// Abstract base class for a bot message handler. /// - [Obsolete("Use `CloudAdapter` instead to process incoming messages.", false)] + /// + /// BotFrameworkAdapter is still supported but the recommended adapter is `CloudAdapter`. + /// public abstract class BotMessageHandlerBase { ///