Resolve syncing conflicts from live-sync-work to live

.vscode/docfx-assistant/topic-cache.json

@@ -0,0 +1 @@
+[]

articles/bot-builder-deploy-az-cli.md

@@ -3,11 +3,10 @@ title: Deploy your bot | Microsoft Docs
 description: Deploy your bot to the Azure cloud.
 keywords: deploy bot, azure deploy bot, publish bot
 author: ivorb
-ms.author: v-ivorb
+ms.author: kamrani
 manager: kamrani
 ms.topic: conceptual
 ms.service: bot-service
-ms.subservice: abs
 ms.date: 05/23/2019
 monikerRange: 'azure-bot-service-4.0'
 ---
@@ -39,6 +38,10 @@ az login
 ```
 A browser window will open, allowing you to sign in.
 
+> [!NOTE]
+> If you deploy your bot to a non-Azure cloud such as US Gov, you need to run `az cloud set --name <name-of-cloud>` before `az login`, where &lt;name-of-cloud> is the name of a registered cloud, such as `AzureUSGovernment`. If you want to go back to public cloud, you can run `az cloud set --name AzureCloud`. 
+
+
 ### Set the subscription
 Set the default subscription to use.
 
@@ -123,30 +126,32 @@ az group deployment create --name "<name-of-deployment>" --resource-group "<name
 
 ### Retrieve or create necessary IIS/Kudu files
 
-**For C# bots**
+### [C# bots](#tab/csharp)
 
 ```cmd
 az bot prepare-deploy --lang Csharp --code-dir "." --proj-file-path "MyBot.csproj"
 ```
 
 You must provide the path to the .csproj file relative to --code-dir. This can be performed via the --proj-file-path argument. The command would resolve --code-dir and --proj-file-path to "./MyBot.csproj"
 
-**For JavaScript bots**
+### [JavaScript bots](#tab/javascript)
 
 ```cmd
 az bot prepare-deploy --code-dir "." --lang Javascript
 ```
 
 This command will fetch a web.config which is needed for Node.js apps to work with IIS on Azure App Services. Make sure web.config is saved to the root of your bot.
 
-**For TypeScript bots**
+### [TypeScript bots](#tab/typescript)
 
 ```cmd
 az bot prepare-deploy --code-dir "." --lang Typescript
 ```
 
 This command works similarly to JavaScript above, but for a Typescript bot.
 
+---
+
 ### Zip up the code directory manually
 
 When using the non-configured [zip deploy API](https://github.com/projectkudu/kudu/wiki/Deploying-from-a-zip-file-or-url) to deploy your bot's code, Web App/Kudu's behavior is as follows:

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

@@ -6,7 +6,6 @@ services: bot-service
 author: trrwilson
 manager: nitinme
 ms.service: bot-service
-ms.subservice: bot-service
 ms.topic: conceptual
 ms.date: 05/02/2019
 ms.author: travisw
@@ -27,7 +26,7 @@ Direct Line Speech is currently in preview and requires a quick sign-up in the [
 
 ## Add the Direct Line Speech channel
 
-1. To add the Direct Line Speech Channel, first open the bot in the [Azure Portal](https://portal.azure.com), and click on **Channels** in the configuration blade.
+1. In your browser, navigate to the [Azure Portal](https://portal.azure.com). From your resources, select your **Bot Channel Registration** resource. Click on **Channels** in the *Bot management* section of the configuration blade.
 
     ![highlight of the location for selecting channels to connect to](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-selectchannel.png "selecting channels")
 
@@ -45,19 +44,17 @@ Direct Line Speech is currently in preview and requires a quick sign-up in the [
 
 With the Direct Line Speech channel connected to your bot, you now need to enable Bot Framework Protocol Streaming Extensions support for optimal, low-latency interaction.
 
-1. If you haven't already, open the blade for your bot in the [Azure Portal](https://portal.azure.com). 
-
-1. Click on **Settings** under the **Bot Management** category (right below **Channels**). Click the checkbox for **Enable Streaming Endpoint**.
+1. In the **Bot Channel Registration** resource configuration blade, click on **Settings** under the **Bot Management** category (right below **Channels**). Click the checkbox for **Enable Streaming Endpoint**.
 
     ![enable the streaming protocol](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-enablestreamingsupport.png "enable streaming extension support")
 
 1. At the top of the page, click **Save**.
 
-1. On the same blade, under the **App Service Settings** category, click **Configuration**.
+1. From your resources, select your **App Service** resource. In the displayed blade, under the **Settings** category, click **Configuration**.
 
     ![navigate to app service settings](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-configureappservice.png "configure the app service")
 
-1. Click on `General settings` and then select the option to enable `Web socket` support.
+1. Click on `General settings` tab and then select the option to enable `Web socket` support.
 
     ![enable websockets for the app service](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-enablewebsockets.png "enable websockets")
 
@@ -67,9 +64,17 @@ With the Direct Line Speech channel connected to your bot, you now need to enabl
 
 ## Manage secret keys
 
-Client applications will need a channel secret to connect to your bot through the Direct Line Speech channel. Once you've saved your channel selection, you can retrieve these secret keys from the **Configure Direct Line Speech** page in the Azure Portal.
+Client applications will need a channel secret to connect to your bot through the Direct Line Speech channel. Once you've saved your channel selection, you can retrieve these secret keys following the next steps.
+
+1. From your resources, select your **Bot Channel Registration** resource. Click on **Channels** in the *Bot management* section of the configuration blade.
+1. Click the **Edit** link for the Direct Line Speech.
+
+    ![getting secret keys for Direct Line Speech](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-getspeechsecretkeys1.png "getting secret keys for Direct Line Speech")
+
+    The following window is displayed.
 
-![getting secret keys for Direct Line Speech](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-getspeechsecretkeys.png "getting secret keys for Direct Line Speech")
+    ![getting secret keys for Direct Line Speech](media/voice-first-virtual-assistants/bot-service-channel-directlinespeech-getspeechsecretkeys.png "getting secret keys for Direct Line Speech")
+1. Show and copy the keys to use in your application.
 
 ## Adding protocol support to your bot
 

articles/bot-service-channel-directline-extension-net-bot.md

@@ -0,0 +1,99 @@
+---
+title: .NET bot with direct line app service extension
+titleSuffix: Bot Service
+description: Enable .NET bot to work with direct line app service extension
+services: bot-service
+manager: kamrani
+ms.service: bot-service
+ms.topic: conceptual
+ms.author: kamrani 
+ms.date: 07/25/2019
+---
+
+## .NET bot with direct line app service extension
+
+[!INCLUDE[applies-to-v4](includes/applies-to.md)]
+
+This article describes how to update a bot to work with **named pipes**, and how to enable the direct line app service extension in the **Azure App Service** resource where the bot is hosted.  
+
+## Prerequisites
+
+In order to perform the steps described next, you must have **Azure App Service** resource and related **App Service** in Azure.
+
+## Update .NET bot to use direct line app service extension
+
+1. In Visual Studio, open your bot project.
+1. Add the **Streaming Extension NuGet** package to your project:
+    1. In your project, right click on **Dependencies** and select **Manage NuGet Packages**.
+    1. Under the *Browse* tab, click **Include prerelease** to show the preview packages.
+    1. Select the package **Microsoft.Bot.Builder.StreamingExtensions**.
+    1. Click the **Install** button to install the package; read and agree to the license agreement.
+1. Allow your app to use the **Bot Framework NamedPipe**:
+    - Open the `Startup.cs` file.
+    - In the ``Configure`` method, add code to ``UseBotFrameworkNamedPipe``
+
+    ```csharp
+
+    using Microsoft.Bot.Builder.StreamingExtensions;
+
+    public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+    {
+        if (env.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+        else
+        {
+            app.UseHsts();
+        }
+
+        app.UseDefaultFiles();
+        app.UseStaticFiles();
+
+        // Allow bot to use named pipes.
+        app.UseBotFrameworkNamedPipe();
+
+        app.UseMvc();
+    }
+    ```
+
+1. Save the `Startup.cs` file.
+1. Open the `appsettings.json` file and enter the following values:
+    1. `"MicrosoftAppId": "<secret Id>"`
+    1. `"MicrosoftAppPassword": "<secret password>"`
+
+    The values are the **appid** and the **appSecret** associated with the service registration group.
+
+1. **Publish** the bot to your Azure App Service.
+1. In your browser, navigate to https://<your_app_service>.azurewebsites.net/.bot. 
+If everything is correct, the page will return this JSON content: `{"k":true,"ib":true,"ob":true,"initialized":true}`.
+
+## Enable Direct Line App Service Extension
+
+This section describes how to enable the direct line app service extension using keys from your bot’s channel configuration and the **Azure App Service** resource where your bot is hosted.
+
+### Gather your Direct Line Extension keys
+
+1. In your browser, navigate to the [Azure portal](https://portal.azure.com/)
+1. In the Azure portal, locate your **Azure Bot Service** resource
+1. Click on **Channels** to configure the bot’s channels
+1. If it is not already enabled, click on the **Direct Line** channel to enable it. 
+1. If it is already enabled, in the Connect to channels table click on the **Edit** link on the Direct Line row.
+1. Scroll down to the App Service Extension Keys section. 
+1. Click on the **Show link** to reveal one of the keys, then copy its value.
+
+![App service extension keys](./media/channels/direct-line-extension-extension-keys.png)
+
+### Enable the Direct Line App Service Extension
+
+1. In your browser, navigate to the [Azure portal](https://portal.azure.com/)
+1. In the Azure portal, locate the **Azure App Service** resource page for the Web App where your bot is or will be hosted
+1. Click on **Configuration**. Under the *Application settings* section, add the following new settings:
+
+    |Name|Value|
+    |---|---|
+    |DirectLineExtensionKey|<App_Service_Extension_Key_From_Section_1>|
+    |DIRECTLINE_EXTENSION_VERSION|latest|
+
+1. Within the *Configuration* section, click on the **General** settings section and turn on **Web sockets**
+1. Click on **Save** to save the settings. This restarts the Azure App Service.

articles/bot-service-channel-directline-extension-net-client.md

@@ -0,0 +1,127 @@
+---
+title: Create .NET client to connect to direct line app service extension
+titleSuffix: Bot Service
+description: .NET client C# to connect to direct line app service extension
+services: bot-service
+manager: kamrani
+ms.service: bot-service
+ms.topic: conceptual
+ms.author: kamrani 
+ms.date: 07/25/2019
+---
+
+## Create .NET client to connect to direct line app service extension
+
+This article describes how to create a .NET client in C# which connects to the direct line app service extension.
+
+### Gather your Direct Line Extension keys
+
+1. In your browser, navigate to the [Azure portal](https://portal.azure.com/)
+1. In the Azure portal, locate your **Azure Bot Service** resource
+1. Click on **Channels** to configure the bot’s channels
+1. If it is not already enabled, click on the **Direct Line** channel to enable it. 
+1. If it is already enabled, in the Connect to channels table click on the **Edit** link on the Direct Line row.
+1. Scroll to the Sites section. There is typically a Default Site unless you have deleted or renamed it.
+1. Click on the **Show link** to reveal one of the keys, then copy its value.
+
+![App service extension keys](./media/channels/direct-line-extension-extension-keys-net-client.png)
+
+> [!NOTE]
+> This value is your direct line client secret used to connect to direct
+line app service extension. You can create additional sites if you’d like and use
+those secret values as well.
+
+### Add the Preview Nuget Package Source
+
+The preview NuGet packages needed to create a C# Direct line client can be found in a NuGet feed.
+
+1. In Visual Studio navigate to the **Tools->Options** menu item.
+1. Select the **NuGet Package Manager->Package Sources** item.
+1. Click on the + button to add a new package source with these values:
+    - Name: DL ASE Preview
+    - Source: https://botbuilder.myget.org/F/experimental/api/v3/index.json
+1. Click on the **Update** button to save the values.
+1. Click **OK** to exit the Package Sources configuration.
+
+### Create a C# Direct Line Client
+
+Interactions with the direct line app service extension happen differently than traditional Direct Line becuase most communication happens over a *WebSocket*. The updated direct line client includes helper classes for opening and closing a *WebSocket*, sending commands through the WebSocket, and receiving Activities back from the bot. This section describes how to create a simple C# client to interact with a bot.
+
+1. Create a new .NET Core 2.2 console application project in Visual Studio.
+1. Add the **DirectLine client NuGet** to your project
+    - Click on Dependencies in the Solution tree
+    - Select **Manage Nuget Packages...**
+    - Change the Package source to the one you defined from above (DL ASE Preview)
+    - Find the package *Microsoft.Bot.Connector.Directline* version v3.0.3-Preview1 or later.
+    - Click on **Install Package**.
+1. Create a client and generate a token using a secret. This step is the same as building any other C# Direct Line client except the endpoint you need use in your bot,appended with the **.bot/** path as shown next. Do not forget the ending **/**.
+
+    ```csharp
+    string endpoint = "https://<YOUR_BOT_HOST>.azurewebsites.net/.bot/";
+    string secret = "<YOUR_BOT_SECRET>";
+
+    var tokenClient = new DirectLineClient(
+        new Uri(endpoint),
+        new DirectLineClientCredentials(secret));
+    var conversation = await tokenClient.Tokens.GenerateTokenForNewConversationAsync();
+    ```
+
+1. Once you have a conversation reference from generating a token, you can use this conversation ID to open a WebSocket with the new `StreamingConversations` property on the `DirectLineClient`. To do this you need to create a callback that will be invoked when the bot wants to send `ActivitySets` to the client:
+
+    ```csharp
+    public static void ReceiveActivities(ActivitySet activitySet)
+    {
+        if (activitySet != null)
+        {
+            foreach (var a in activitySet.Activities)
+            {
+                if (a.Type == ActivityTypes.Message && a.From.Id.Contains("bot"))
+                {
+                    Console.WriteLine($"<Bot>: {a.Text}");
+                }
+            }
+        }
+    }
+    ```
+
+1. Now you are ready to open the WebSocket on the `StreamingConversations` property using the conversation’s token, `conversationId`, and your `ReceiveActivities` callback:
+
+    ```csharp
+    var client = new DirectLineClient(
+        new Uri(endpoint),
+        new DirectLineClientCredentials(conversation.Token));
+
+    await client.StreamingConversations.ConnectAsync(
+        conversation.ConversationId,
+        ReceiveActivities);
+    ```
+
+1. The client can now be used to start a conversation and send `Activities` to the bot:
+
+    ```csharp
+
+    var startConversation = await client.StreamingConversations.StartConversationAsync();
+    var from = new ChannelAccount() { Id = "123", Name = "Fred" };
+    var message = Console.ReadLine();
+
+    while (message != "end")
+    {
+        try
+        {
+            var response = await client.StreamingConversations.PostActivityAsync(
+                startConversation.ConversationId,
+                new Activity()
+                {
+                    Type = "message",
+                    Text = message,
+                    From = from
+                });
+        }
+        catch (OperationException ex)
+        {
+            Console.WriteLine(
+                $"OperationException when calling PostActivityAsync: ({ex.StatusCode})");
+        }
+        message = Console.ReadLine();
+    }
+    ```