Release 'live' 11-01-2019 (Ignite) (#1789)

articles/TOC.md

@@ -19,6 +19,7 @@
 ## [Middleware](v4sdk/bot-builder-concept-middleware.md)
 ## [User authentication](v4sdk/bot-builder-concept-authentication.md)
 ## [Manage bot resources](v4sdk/bot-file-basics.md)
+## [How bots for Microsoft Teams work](v4sdk/bot-builder-basics-teams.md)
 <!-- [Language understanding](v4sdk/bot-builder-concept-luis.md) -->
 ## [Bot Service templates](bot-service-concept-templates.md)
 ## [Cognitive Services](bot-service-concept-intelligence.md)
@@ -56,6 +57,7 @@
 ### [Node.js](nodejs/TOC.md)
 ## Test
 ### [Unit testing bots](v4sdk/unit-test-bots.md)
+### [Add trace activities to your bot](v4sdk/using-trace-activities.md)
 ## [Debug](debug/TOC.md)
 ## Deploy
 ### [Deploy your bot to Azure](bot-builder-deploy-az-cli.md)
@@ -68,5 +70,8 @@
 ## [REST](rest-api/TOC.md)
 ## [.NET SDK v3](https://aka.ms/botframework-v3-cs-sdk)
 ## [Node.js SDK v3](https://aka.ms/bot-jssdk-v3)
+## BF CLI tool reference
+### [BF CLI overview](v4sdk/bf-cli-overview.md)
+### [BF CLI reference](v4sdk/bf-cli-reference.md)
 ## [Entities and activity types](bot-service-activities-entities.md)
 # [Resources](resources/TOC.md)

articles/bot-service-channel-connect-facebook.md

@@ -129,6 +129,9 @@ Ensure that the Facebook Page associated with this bot is published. Status appe
 
 ## Connect a bot to Facebook Workplace
 
+> [!NOTE]
+> Starting December 16, 2019, Workplace by Facebook is changing security model for custom integrations.  Current integrations built using Microsoft Bot Framework v4 on JavaScript/Node.js need to be updated to use the Bot Framework [Facebook for Workplace Adapter](https://aka.ms/botframework-workplace-adapter) and deployed using Azure Web App to continue working past that date. New Microsoft Bot Framework bots that are targeting Workplace should also be developed using that adapter.
+
 Facebook Workplace is a business-oriented version of Facebook, which allows employees to easily connect and collaborate. It contains live videos, news feeds, groups, messenger, reactions, search, and trending posts. It also supports:
 
 - Analytics and integrations. A dashboard with analytics, integration, single sign-on, and identity providers that companies use to integrate Workplace with their existing IT systems.

articles/bot-service-channel-connect-skypeforbusiness.md

@@ -15,22 +15,6 @@ ms.date: 12/13/2017
 Skype for Business Online keeps you connected with co-workers and business partners through instant messaging, phone, and video calls. Extend this functionality by building bots that users can discover and interact with through the Skype for Business interface.
 
 > [!IMPORTANT]
-> **Skype for Business channel in Bot Framework is being deprecated on June 30, 2019.**
+> **Skype for Business channel of Bot Framework was deprecated on June 30, 2019.**
 > 
-> No new bots will be able to add Skype for Business channel after that date.  Existing bots will continue to work until October 31, 2019. Microsoft Teams is the preferred communication tool from Microsoft.  Learn how to [connect your bot to Microsoft Teams](https://msdn.microsoft.com/microsoft-teams/bots).
-
-## Enable the channel
-
-Open the bot in the [Azure Portal](https://portal.azure.com/), click the **Channels** blade, and then click **Skype for Business**. The bot is now enabled. 
-
-Connecting the bot with Skype for Business Online is performed by a **Tenant Administrator** of that Skype for Business tenant.
-
-## Next steps
-* [Skype for Business Bot Framework](https://msdn.microsoft.com/skype/Skype-For-Business-Bot-Framework/docs/overview)
-
-
-
-
-
-
-
+> Skype for Business channel stopped accepting new bots on June 30, 2019.  Existing bots continued operating through October 31, 2019.  The channel is currently being deprecated, and no production loads should be using it.  Microsoft Teams is the preferred communication tool from Microsoft.  Learn how to [connect your bot to Microsoft Teams](https://msdn.microsoft.com/microsoft-teams/bots).

articles/bot-service-channel-connect-wechat.md

@@ -0,0 +1,161 @@
+---
+title: Connect a bot to WeChat | Microsoft Docs
+description: Learn how to configure a bot's connection to WeChat.
+keywords: WeChat, Tencent, bot channel, WeChat App, WeChat bot, App ID, App Secret, credentials
+author: seaen
+manager: kamrani
+ms.topic: article
+ms.author: egorn
+ms.service: bot-service
+ms.date: 11/01/2019
+---
+
+# Connect a bot to WeChat
+
+You can configure your bot to communicate with people using the WeChat Official Accounts Platform.
+
+## Download WeChat Adapter for Bot Framework
+
+WeChat adapter for Microsoft Bot Framework is an open source adapter on GitHub. [Download WeChat Adapter for Bot Framework](https://github.com/microsoft/BotFramework-WeChat/).
+
+## Create a WeChat Account
+
+To configure a bot to communicate using WeChat, you need to create a WeChat official account on [WeChat Official Account Platform](https://mp.weixin.qq.com/?lang=en_US) and then connect the bot to the app. Currently we only support Service Account.
+
+### Change Your Prefer Language
+
+You can change the display language you prefer before login.
+
+ ![change_language](./media/channels/wechat-change-language.png)
+
+### Register A Service Account
+
+A real service account must be verified by WeChat, you can’t enable webhook before account is verified. To create your own service account, please follow the instruction [Here](https://kf.qq.com/product/weixinmp.html#hid=87).
+For short, just click the Register Now on the top, select the Service Account and follow the instruction.
+
+ ![register_account](./media/channels/wechat-register-account.png)
+
+### Sandbox Account
+
+If you just want to test the WeChat and bot integration, you can use a sandbox account instead of creating the service account. Learn more about creating a [sandbox account](https://mp.weixin.qq.com/debug/cgi-bin/sandbox?t=sandbox/login).
+
+## Enable WeChat Adapter To Bot
+
+The Bot Project is a regular Bot Framework SDK V4 project. Before you can launch it, you need to make sure you can run the bot. Download [WeChat Adapter for Bot Framework](https://github.com/microsoft/BotFramework-WeChat/).
+
+### Prerequisites
+
+    .NET Core SDK (version 2.2.x)
+
+### Add Reference To WeChat Adapter Source
+
+Please directly reference the WeChat adapter project or add ~/BotFramework-WeChat/libraries/csharp_dotnetcore/outputpackages as local NuGet source.
+
+### Inject WeChat Adapter In Your Bot Startup.cs
+
+```csharp
+public void ConfigureServices(IServiceCollection services)
+{
+    services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+
+    // Create the storage we'll be using for User and Conversation state. (Memory is great for testing purposes.)
+    services.AddSingleton<IStorage, MemoryStorage>();
+
+    // Create the User state. (Used in this bot's Dialog implementation.)
+    services.AddSingleton<UserState>();
+
+    // Create the Conversation state. (Used by the Dialog system itself.)
+    services.AddSingleton<ConversationState>();
+
+    // Load WeChat settings.
+    var wechatSettings = new WeChatSettings();
+    Configuration.Bind("WeChatSettings", wechatSettings);
+    services.AddSingleton<WeChatSettings>(wechatSettings);
+
+    // Configure hosted serivce.
+    services.AddSingleton<IBackgroundTaskQueue, BackgroundTaskQueue>();
+    services.AddHostedService<QueuedHostedService>();
+    services.AddSingleton<WeChatHttpAdapter>();
+
+    // The Dialog that will be run by the bot.
+    services.AddSingleton<MainDialog>();
+
+    // Create the bot as a transient. In this case the ASP Controller is expecting an IBot.
+    services.AddTransient<IBot, EchoBot>();
+}
+```
+
+### Update Your Bot Controller
+
+```csharp
+[Route("api/messages")]
+[ApiController]
+public class BotController : ControllerBase
+{  
+    private readonly IBot _bot;
+    private readonly WeChatHttpAdapter _weChatHttpAdapter;
+    private readonly string Token;
+    public BotController(IBot bot, WeChatHttpAdapter weChatAdapter)
+    {
+        _bot = bot;
+        _weChatHttpAdapter = weChatAdapter;
+    }
+
+    [HttpPost("/WeChat")]
+    [HttpGet("/WeChat")]
+    public async Task PostWeChatAsync([FromQuery] SecretInfo secretInfo)
+    {
+        // Delegate the processing of the HTTP POST to the adapter.
+        // The adapter will invoke the bot.
+        await _weChatHttpAdapter.ProcessAsync(Request, Response, _bot, secretInfo);
+    }
+}
+```
+
+### Setup appsettings.json
+
+You will need to set up appsettings.json before start up the bot, you can find what you need below.
+
+```json
+"WeChatSettings": {
+    "UploadTemporaryMedia": true,
+    "PassiveResponseMode": false,
+    "Token": "",
+    "EncodingAESKey": "",
+    "AppId": "",
+    "AppSecret": ""
+}
+```
+
+#### Service Account
+
+If you already have a service account and ready to deploy, then you can find **AppID** , **AppSecret** , **EncodingAESKey** and **Token** in the basic configurations on the left nav bar, like below.
+
+Don't forgot you need to set up the IP white list, otherwise WeChat won't accept your request.
+
+ ![serviceaccount_console](./media/channels/wechat-serviceaccount-console.png)
+
+#### Sandbox Account
+
+Sandbox account don't have **EncodingAESKey** , message from WeChat was not encrypted just leave EncodingAESKey blank. You only have three parameters here, **appID** , **appsecret** and **Token**.
+
+ ![sandbox_account](./media/channels/wechat-sandbox-account.png)
+
+### Start Bot And Set Endpoint URL
+
+Now you can set your bot backend. Before you are doing this, you have to start the bot before you save the settings, WeChat will send you a request to verify the URL.
+Please set the endpoint in such pattern: **https://your_end_point/WeChat**, or set your personal settings the same with what you have done in BotController.cs
+
+ ![sandbox_account2](./media/channels/wechat-sandbox-account-2.png)
+
+### Subscribe Your Official Account
+
+You can find a QR code to subscribe your test account as in WeChat.
+
+ ![subscribe](./media/channels/wechat-subscribe.png)
+
+## Test Through WeChat
+
+Everything is done, you can try it in your WeChat client. You can try our sample bot under tests folder. This sample bot includes wechat adapter and integrated with echo bot and Cards bot.
+
+ ![chat](./media/channels/wechat-chat.png)

articles/bot-service-channel-directline.md

@@ -7,11 +7,11 @@ author: ivorb
 manager: kamrani
 ms.service: bot-service
 ms.topic: conceptual
-ms.date: 05/02/2019
+ms.date: 11/01/2019
 ms.author: kamrani
 ---
 
-## About Direct Line
+# About Direct Line
 
 The Bot Framework Direct Line channel is an easy way to integrate your bot into your mobile app, webpage, or other application.
 Direct Line is available in three forms:

articles/manage/TOC.md

@@ -25,6 +25,7 @@
 ## [Slack](../bot-service-channel-connect-slack.md) 
 ## [Telegram](../bot-service-channel-connect-telegram.md) 
 ## [Twilio](../bot-service-channel-connect-twilio.md)
+## [WeChat](../bot-service-channel-connect-wechat.md)
 ## [Web Chat](../bot-service-channel-connect-webchat.md)
 ## [Additional channels](../bot-service-channel-additional-channels.md)
 # [Configure bot settings](../bot-service-manage-settings.md)

articles/v4sdk/bf-cli-overview.md

@@ -0,0 +1,89 @@
+---
+title: Azure Bot Framework Command-Line Interface (CLI) overview | Microsoft Docs
+description: Learn about the Bot Framework Command-Line Interface (CLI).
+keywords: Bot Framework Command-Line Interface, Bot Framework CLI
+author: JonathanFingold
+ms.author: kamrani
+manager: kamrani
+ms.topic: article
+ms.service: bot-service
+ms.date: 11/01/2019
+monikerRange: 'azure-bot-service-4.0'
+---
+
+<!--TODO:
+- [?] Add to TOC: Reference/Bot Framework CLI/Reference
+- [?] Add other topics to the same node for each of the command groups
+-->
+# Bot Framework CLI overview
+
+[!INCLUDE[applies-to](../includes/applies-to.md)]
+
+Bot Framework Command-Line Interface (CLI) is a cross-platform tool that allows you to manage bots and related services. It replaces a collection of older standalone CLI tools by aggregating them into a single tool. 
+
+## Prerequisites
+
+* [Node.js](https://nodejs.org/), version 10.14.1 or later.
+
+## Installation
+
+Install the BF CLI from the command line.
+
+~~~cmd
+npm i -g @microsoft/botframework-cli
+~~~
+
+## Available commands
+
+The following commands are currently available.
+
+| Old tool | BF command set | Description |
+| :--- | :--- | :--- |
+| ChatDown | [`bf chatdown`](bf-cli-reference.md#bf-chatdown) | Commands for working with chat dialog (**.chat**) files. |
+| na | [`bf config`](bf-cli-reference.md#bf-config) | Configures various settings within the CLI. |
+| LuDown, LuisGen | [`bf luis`](bf-cli-reference.md#bf-luis) | Commands for working with LUIS resource files and managing LUIS models. |
+| QnAMaker | [`bf qnamaker`](bf-cli-reference.md#bf-qnamaker) | Commands for working with QnA Maker resource files and managing knowledge bases. |
+
+The following tools will be ported in upcoming releases:
+- LUIS (API)
+- Dispatch
+
+See [Porting Map](https://github.com/microsoft/botframework-cli/blob/master/PortingMap.md) for a mapping reference between the old and new tools.
+
+_Note: The older CLI tools will be deprecated in upcoming releases and support for them will end in the future.
+All new investments, bug fixes, and new features in this area will target only the BF CLI._
+
+## Overview
+
+The BF CLI manages bots and related services. It is part of the Microsoft Bot Framework, a comprehensive framework for building enterprise-grade conversational AI experiences. In addition to managing bot related resources, the BF CLI can be used as part of continuous integration and continuous deployment (CI/CD) pipelines. As you build your bot, you might also need to integrate AI services like LUIS for language understanding, QnAMaker for your bot to respond to simple questions in a Q&A format, and more. To integrate AI service in your bot, use:
+
+* [`bf luis`](bf-cli-reference.md#bf-luis) command to work with LUIS **.lu** resource files and manage LUIS models. It can also generate corresponding source (C# or JavaScript) code.
+* [LUIS APIs tool](https://github.com/microsoft/botbuilder-tools/tree/master/packages/LUIS/readme.md) to deploy the local files, train, test, and publish them as Language Understanding models within the LUIS service.
+* [`bf qnamaker`](bf-cli-reference.md#bf-qnamaker) command to work with QnAMaker knowledge bases. It can create and manage QnA Maker assets both locally, and on the QnA Maker service.
+
+* Refer to the lu library [documentation](https://github.com/microsoft/botframework-cli/tree/master/packages/lu/README.md) for how to work with **.lu** and **.qna** file formats.
+
+As your bot becomes more sophisticated, use the [Dispatch](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/Dispatch) CLI tool to create, evaluate, and dispatch intent across multiple LUIS models and QnA Maker knowledge bases.
+
+To test and refine your bot, you can use the new [Bot Framework Emulator](https://github.com/Microsoft/BotFramework-Emulator/releases). The Emulator enables you to test and debug your bots on local machine or in the cloud.
+
+During early design stages you might want to create mock conversations between the user and the bot for the specific scenarios your bot will support. Use [`bf chatdown`](bf-cli-reference.md#bf-chatdown) command to author conversation mockup **.chat** files, convert them into rich transcripts, and view the conversations in the the Emulator.
+
+Lastly, with the [Azure CLI](https://github.com/microsoft/botframework-cli/blob/master/AzureCli.md) (`az bot` command), you can create, download, publish, and configure channels with the [Azure Bot Service](https://azure.microsoft.com/services/bot-service/). It is a plugin that extends the functionality of the [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) to manage your Azure Bot Service assets.
+
+## Privacy and instrumentation
+BF CLI contains instrumentation options that are designed to help us improve the tool based on **anonymous** usage patterns. __It is disabled, opted-out by default__. If you elect to opt-in, Microsoft gathers some usage data:
+
+* Command group calls
+* Flags used, **excluding** specific values. For example, for the parameter `--folder:name`, only the use of `--folder` is gathered, the folder name is not gathered.
+
+To modify data collection behavior, use the [`bf config`](bf-cli-reference.md#bf-config) command.
+
+Please refer to [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement) for more details.  
+
+## Issues and feature requests
+- You can file issues and feature requests [here](https://github.com/microsoft/botframework-cli/issues).
+- You can find known issues [here](https://github.com/microsoft/botframework-cli/labels/known-issues).
+
+## Next steps
+- [BF cli reference](bf-cli-reference.md)