From a393b25941941117f097391fd0721288d4e755c1 Mon Sep 17 00:00:00 2001 From: Jason Sowers Date: Fri, 5 Oct 2018 13:35:06 -0700 Subject: [PATCH 1/5] added channels to connector --- .../Choices/Channel.cs | 16 +------------ libraries/Microsoft.Bot.Connector/Channels.cs | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 libraries/Microsoft.Bot.Connector/Channels.cs diff --git a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs index bb181965e2..e2bc1c4f99 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs @@ -64,22 +64,8 @@ public static bool HasMessageFeed(string channelId) public static string GetChannelId(ITurnContext turnContext) => string.IsNullOrEmpty(turnContext.Activity.ChannelId) ? string.Empty : turnContext.Activity.ChannelId; - public class Channels + public class Channels : Connector.Channels { - public const string Facebook = "facebook"; - public const string Skype = "skype"; - public const string Msteams = "msteams"; - public const string Telegram = "telegram"; - public const string Kik = "kik"; - public const string Email = "email"; - public const string Slack = "slack"; - public const string Groupme = "groupme"; - public const string Sms = "sms"; - public const string Emulator = "emulator"; - public const string Directline = "directline"; - public const string Webchat = "webchat"; - public const string Console = "console"; - public const string Cortana = "cortana"; } } } diff --git a/libraries/Microsoft.Bot.Connector/Channels.cs b/libraries/Microsoft.Bot.Connector/Channels.cs new file mode 100644 index 0000000000..eea5f8f104 --- /dev/null +++ b/libraries/Microsoft.Bot.Connector/Channels.cs @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +namespace Microsoft.Bot.Connector +{ + public class Channels + { + public const string Facebook = "facebook"; + public const string Skype = "skype"; + public const string Msteams = "msteams"; + public const string Telegram = "telegram"; + public const string Kik = "kik"; + public const string Email = "email"; + public const string Slack = "slack"; + public const string Groupme = "groupme"; + public const string Sms = "sms"; + public const string Emulator = "emulator"; + public const string Directline = "directline"; + public const string Webchat = "webchat"; + public const string Console = "console"; + public const string Cortana = "cortana"; + } +} From a6fd512d6fb1ac85b54c0a87183ead729b254371 Mon Sep 17 00:00:00 2001 From: Jason Sowers Date: Mon, 8 Oct 2018 16:28:33 -0700 Subject: [PATCH 2/5] added obsolete attribute --- libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs index e2bc1c4f99..0c9ffc9a40 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System; + namespace Microsoft.Bot.Builder.Dialogs.Choices { public class Channel @@ -64,6 +66,7 @@ public static bool HasMessageFeed(string channelId) public static string GetChannelId(ITurnContext turnContext) => string.IsNullOrEmpty(turnContext.Activity.ChannelId) ? string.Empty : turnContext.Activity.ChannelId; + [Obsolete("This class has is deprecated, please use Microsoft.Bot.Connector.Channels")] public class Channels : Connector.Channels { } From 534170e5af0782a7e3e646f59b3e286786dc079e Mon Sep 17 00:00:00 2001 From: Jason Sowers Date: Mon, 8 Oct 2018 16:38:04 -0700 Subject: [PATCH 3/5] added commenting --- libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs index 0c9ffc9a40..f77608ce51 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs @@ -66,7 +66,10 @@ public static bool HasMessageFeed(string channelId) public static string GetChannelId(ITurnContext turnContext) => string.IsNullOrEmpty(turnContext.Activity.ChannelId) ? string.Empty : turnContext.Activity.ChannelId; - [Obsolete("This class has is deprecated, please use Microsoft.Bot.Connector.Channels")] + // This class has been deprecated in favor of the class in Microsoft.Bot.Connector.Channels. + // https://github.com/Microsoft/botbuilder-dotnet/libraries/Microsoft.Bot.Connector/Channels.cs + // This change is non-breaking and this class now inherits from the class in the connector library. + [Obsolete("This class has is deprecated, please use Microsoft.Bot.Connector.Channels instead of this")] public class Channels : Connector.Channels { } From 18c91a0cc361db2bfd7d2cff5bfc09910ea45a74 Mon Sep 17 00:00:00 2001 From: Jason Sowers Date: Mon, 8 Oct 2018 16:40:39 -0700 Subject: [PATCH 4/5] comments --- libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs index f77608ce51..84ae5ed980 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs @@ -66,10 +66,10 @@ public static bool HasMessageFeed(string channelId) public static string GetChannelId(ITurnContext turnContext) => string.IsNullOrEmpty(turnContext.Activity.ChannelId) ? string.Empty : turnContext.Activity.ChannelId; - // This class has been deprecated in favor of the class in Microsoft.Bot.Connector.Channels. - // https://github.com/Microsoft/botbuilder-dotnet/libraries/Microsoft.Bot.Connector/Channels.cs + // This class has been deprecated in favor of the class in Microsoft.Bot.Connector.Channels located + // at https://github.com/Microsoft/botbuilder-dotnet/libraries/Microsoft.Bot.Connector/Channels.cs. // This change is non-breaking and this class now inherits from the class in the connector library. - [Obsolete("This class has is deprecated, please use Microsoft.Bot.Connector.Channels instead of this")] + [Obsolete("This class has is deprecated, please use Microsoft.Bot.Connector.Channels in it's place")] public class Channels : Connector.Channels { } From 9a8ec0450f492ddd2aa714b356147aecd2e2f785 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Tue, 9 Oct 2018 15:57:35 -0500 Subject: [PATCH 5/5] Update Channel.cs --- libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs index 84ae5ed980..a3350142cb 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs/Choices/Channel.cs @@ -69,7 +69,7 @@ public static string GetChannelId(ITurnContext turnContext) => string.IsNullOrEm // This class has been deprecated in favor of the class in Microsoft.Bot.Connector.Channels located // at https://github.com/Microsoft/botbuilder-dotnet/libraries/Microsoft.Bot.Connector/Channels.cs. // This change is non-breaking and this class now inherits from the class in the connector library. - [Obsolete("This class has is deprecated, please use Microsoft.Bot.Connector.Channels in it's place")] + [Obsolete("This class is deprecated. Please use Microsoft.Bot.Connector.Channels.")] public class Channels : Connector.Channels { }