Release 08-01-2017 (#207)

articles/TOC.md

@@ -34,6 +34,7 @@
 #### [Dialogs overview](~/dotnet/bot-builder-dotnet-dialogs.md)
 #### [Manage conversation flow](~/dotnet/bot-builder-dotnet-manage-conversation-flow.md)
 #### [Enable language understanding](~/dotnet/bot-builder-dotnet-luis-dialogs.md)
+#### [Scorable dialogs](~/dotnet/bot-builder-dotnet-scorable-dialogs.md)
 ### FormFlow
 #### [Basic features of FormFlow](~/dotnet/bot-builder-dotnet-formflow.md)
 #### [Advanced features of FormFlow](~/dotnet/bot-builder-dotnet-formflow-advanced.md)

articles/channel-connect-slack.md

@@ -6,14 +6,14 @@ ms.author: rstand
 manager: tomlm
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 06/12/2017
+ms.date: 07/31/2017
 ---
 
 # Connect a bot to Slack
 
 You can configure your bot to communicate with people using the Slack messaging app.
 
-## Log in to Slack and create a Slack Application for your bot
+## Create a Slack Application for your bot
 
 Log into Slack and [create a Slack application](https://api.slack.com/applications/new).
 
@@ -41,7 +41,12 @@ Next you will add a new Redirect URL.
 
 ## Subscribe to Bot Events
 
-By subscribing to bot events, your app will be notified of user activities at the URL you specify.
+Follow these steps to subscribe to six particular bot events. By subscribing to bot events, your app will be notified of user activities at the URL you specify. 
+
+> [!TIP] 
+> Your bot handle is a property of your bot. To find a bot's handle, 
+> visit [https://dev.botframework.com/bots](https://dev.botframework.com/bots),
+> choose a bot, and click **SETTINGS**. 
 
 1. Select the **Event Subscriptions** tab.
 2. Click **Enable Events** to **On**.
@@ -74,10 +79,11 @@ Click **Add Bot User** to validate your settings, click **Always Show My Bot as
 
 ## Add and Configure Interactive Messages (optional)
 
-If your bot will use Slack-specific functionality such as buttons, select the **Interactive Messages** tab and click **Enable Interactive Messages**.
+If your bot will use Slack-specific functionality such as buttons, follow these steps:
 
-1. Enter https://slack.botframework.com/api/Actions as the Request URL for Interactive Messages.
-2. Click the **Enable Interactive Messages** button and **Save changes** once the URL is successfully validated.
+1. Select the **Interactive Messages** tab and click **Enable Interactive Messages**.
+2. Enter https://slack.botframework.com/api/Actions as the **Request URL**.
+3. Click the **Enable Interactive Messages** button, and then click the **Save changes** button.
 
 ![Enable messages](~/media/channels/slack-MessageURL.png)
 
@@ -92,15 +98,13 @@ In a separate browser window, return to the Bot Framework site at http://dev.bot
 
 1. Select **My bots** and choose the Bot that you want to connect to Slack.
 2. In the **Add a channel** section, click the Slack icon.
-3. In the **Submit your Credentials** section, paste the App Credentials from the Slack website into the appropriate fields. 
+3. In the **Enter your Slack credentials** section, paste the App Credentials from the Slack website into the appropriate fields. 
 4. The **Landing Page URL** is optional. You may remove or change it.
-5. Click **Submit Slack Credentials**.
+5. Click **Save**.
 
 ![Submit credentials](~/media/channels/slack-SubmitCredentials.png)
 
 Follow the instructions to authorize your Slack app's access to your Development Slack Team. 
 
 ## Enable the bot
-Check **Enable this bot on Slack**. Then click **I'm done configuring Slack**.
-
-When you have completed these steps, your bot will be successfully configured to communicate with users in Slack.
+On the Configure Slack page, confirm the slider by the Save button is set to **Enabled**. Your bot is configured to communicate with users in Slack.

articles/dotnet/bot-builder-dotnet-quickstart.md

@@ -50,7 +50,7 @@ Next, open Visual Studio and create a new C# project. Choose the Bot Application
 ![Visual Studio create project](../media/connector-getstarted-create-project.png)
 
 > [!NOTE]
-> Visual Studio might say you need to [download and install IIS Express](https://www.microsoft.com/en-us/download/details.aspx?id=1038). 
+> Visual Studio might say you need to [download and install IIS Express](https://www.microsoft.com/en-us/download/details.aspx?id=48264). 
 
 
 By using the Bot Application template, you're creating a project that already contains all of the

articles/dotnet/bot-builder-dotnet-scorable-dialogs.md

@@ -0,0 +1,160 @@
+---
+title: Global message handlers using scorables
+description: Create more flexible dialogs using scorables within the  Bot Builder SDK for .NET.
+author: matthewshim-ms
+ms.author: v-shimma
+manager: rstand
+ms.topic: article
+ms.prod: bot-framework
+ms.date: 07/12/2017
+---
+# Global message handlers using scorables
+
+Users attempt to access certain functionality within a bot by using words like "help," "cancel," or "start over" in the middle of a conversation when the bot is expecting a different response. You can design your bot to gracefully handle such requests using scorable dialogs.
+
+Scorable dialogs monitor all incoming messages and determine whether a message is actionable in some way. Messages that are scorable are assigned a score between [0 – 1] by each scorable dialog. The scorable dialog that determines the highest score is added to the top of the dialog stack and then hands the response to the user. After the scorable dialog completes execution, the conversation continues from where it left off.
+
+Scorables enable you to create more flexible conversations by allowing your users to 'interrupt' the normal conversation flow you find in regular dialogs.
+
+## Create a scorable dialog
+
+First, define a new [dialog](bot-builder-dotnet-dialogs.md). The following code uses a dialog that is derived from the `IDialog` interface.
+
+```cs
+public class SampleDialog : IDialog<object>
+{
+    public async Task StartAsync(IDialogContext context)
+    {
+        await context.PostAsync("This is a Sample Dialog which is Scorable. Reply with anything to return to the prior prior dialog.");
+
+        context.Wait(this.MessageReceived);
+    }
+
+    private async Task MessageReceived(IDialogContext context, IAwaitable<IMessageActivity> result)
+    {
+        var message = await result;
+
+        if ((message.Text != null) && (message.Text.Trim().Length > 0))
+        {
+            context.Done<object>(null);
+        }
+        else
+        {
+            context.Fail(new Exception("Message was not a string or was an empty string."));
+        }
+    }
+}
+```
+To make a scorable dialog, create a class that inherits from the `ScorableBase` abstract class. The following code shows a `SampleScorable` class.
+
+```cs
+using Microsoft.Bot.Builder.Dialogs;
+using Microsoft.Bot.Builder.Dialogs.Internals;
+using Microsoft.Bot.Builder.Internals.Fibers;
+using Microsoft.Bot.Builder.Scorables.Internals;
+
+public class SampleScorable : ScorableBase<IActivity, string, double>
+{
+    private readonly IDialogTask task;
+
+    public SampleScorable(IDialogTask task)
+    {
+        SetField.NotNull(out this.task, nameof(task), task);
+    }
+}
+```
+The `ScorableBase` abstract class inherits from the `IScorable` interface. You will need to implement the following `IScorable` methods in your class:
+
+- `PrepareAsync` is the first method that is called in the scorable instance. It accepts incoming message activity, analyzes and sets the dialog's state, which is passed to all the other methods of the `IScorable` interface.
+
+```cs
+protected override async Task<string> PrepareAsync(IActivity item, CancellationToken token)
+{
+        // TODO: insert your code here
+}
+```
+
+- The `HasScore` method checks the state property to determine if the scorable dialog should provide a score for the message. If it returns false, the message will be ignored by the scorable dialog.
+
+```cs
+protected override bool HasScore(IActivity item, string state)
+{
+        // TODO: insert your code here
+}
+```
+
+- `GetScore` will only trigger if `HasScore` returns true. You’ll provision the logic in this method to determine the score for a message between 0 - 1.
+
+```cs
+protected override double GetScore(IActivity item, string state)
+{
+        // TODO: insert your code here
+}
+```
+- In the `PostAsync` method, define core actions to be performed for the scorable class. All scorable dialogs will monitor incoming messages, and assign scores to valid messages based on the scorables' GetScore method. The scorable class which determines the highest score (between 0 - 1.0) will then trigger that scorable's `PostAsync` method.
+
+```cs
+protected override Task PostAsync(IActivity item, string state, CancellationToken token)
+{
+        //TODO: insert your code here
+}
+```
+
+- `DoneAsync` is called after the scoring process is complete. Use this method to dispose of any scoped resources.
+
+```cs
+protected override Task DoneAsync(IActivity item, string state, CancellationToken token)
+{
+        //TODO: insert your code here
+}
+```
+
+## Create a module to register the IScorable service
+
+Next, define a `Module` that will register the `SampleScorable` class as a component. This will provision the `IScorable` service.
+
+```cs
+public class GlobalMessageHandlersBotModule : Module
+{
+    protected override void Load(ContainerBuilder builder)
+    {
+        base.Load(builder);
+
+        builder
+            .Register(c => new SampleScorable(c.Resolve<IDialogTask>()))
+            .As<IScorable<IActivity, double>>()
+            .InstancePerLifetimeScope();
+    }
+}
+```
+## Register the module  
+
+The last step in the process is to apply the `SampleScorable` to the bot's Conversation Container. This will register the scorable service within the Bot Framework's message handling pipeline. The following code shows to update the `Conversation.Container` within the bot app's initialization in **Global.asax.cs**:
+
+```cs
+public class WebApiApplication : System.Web.HttpApplication
+{
+    protected void Application_Start()
+    {
+        this.RegisterBotModules();
+        GlobalConfiguration.Configure(WebApiConfig.Register);
+    }
+
+    private void RegisterBotModules()
+    {
+        var builder = new ContainerBuilder();
+        builder.RegisterModule(new ReflectionSurrogateModule());
+
+        //Register the module within the Conversation container
+        builder.RegisterModule<GlobalMessageHandlersBotModule>();
+
+        builder.Update(Conversation.Container);
+    }
+}
+```
+
+## Additional resources
+* [Global Message Handlers sample](https://github.com/Microsoft/BotBuilder-Samples/tree/master/CSharp/core-GlobalMessageHandlers)
+* [Simple Scorable Bot sample](https://github.com/Microsoft/BotFramework-Samples/tree/master/CSharp/ScorableBotSample)
+* [Dialogs overview](bot-builder-dotnet-dialogs.md)
+* [AutoFac](https://autofac.org/)

articles/includes/code/dotnet-add-attachments.cs

@@ -11,7 +11,7 @@
 
 // <addHeroCardAttachment>
 Activity replyToConversation = message.CreateReply("Should go to conversation, in carousel format");
-replyToConversation.AttachmentLayout = AttachmentLayouts.Carousel;
+replyToConversation.AttachmentLayout = AttachmentLayoutTypes.Carousel;
 replyToConversation.Attachments = new List<Attachment>();
 
 Dictionary<string, string> cardContentList = new Dictionary<string, string>();
@@ -54,7 +54,7 @@
 
 // <addThumbnailCardAttachment>
 Activity replyToConversation = message.CreateReply("Should go to conversation, in list format");
-replyToConversation.AttachmentLayout = AttachmentLayouts.List;
+replyToConversation.AttachmentLayout = AttachmentLayoutTypes.List;
 replyToConversation.Attachments = new List<Attachment>();
 
 Dictionary<string, string> cardContentList = new Dictionary<string, string>();
@@ -251,4 +251,4 @@
 replyToConversation.Attachments.Add(attachment);
 
 var reply = await connector.Conversations.SendToConversationAsync(replyToConversation);
-// </addAdaptiveCardAttachment>
+// </addAdaptiveCardAttachment>

articles/nodejs/bot-builder-nodejs-dialog-manage-conversation-flow.md

@@ -48,7 +48,7 @@ var bot = new builder.UniversalBot(connector, [
     },
     function (session, results) {
         session.dialogData.partySize = results.response;
-        builder.Prompts.text(session, "Who's name will this reservation be under?");
+        builder.Prompts.text(session, "Whose name will this reservation be under?");
     },
     function (session, results) {
         session.dialogData.reservationName = results.response;

articles/resources-links-help.md

@@ -6,7 +6,7 @@ ms.author: rstand
 manager: rstand
 ms.topic: article
 ms.prod: bot-framework
-ms.date: 06/12/2017
+ms.date: 07/31/2017
 ---
 
 # Bot Framework additional resources
@@ -22,4 +22,6 @@ These resources provide additional information and support for developing bots w
 |**Community support** | [StackOverflow](https://stackoverflow.com/questions/tagged/botframework)
 |**Using a bot** | Contact the bot's developer through their publisher e-mail                 
 |**Bot Builder SDK issues/suggestions**| Use the issues tab on the <a href="https://github.com/Microsoft/BotBuilder/" target="_blank">GitHub repo</a>
-|**Reporting Abuse**| Contact us at [[email protected]](mailto://[email protected])
+|**Documentation issues**| Submit an <a href="https://github.com/Microsoft/bot-framework-docs/issues" target="_blank">issue</a> to the Bot Framework documentation GitHub repo.
+|**Documentation updates**| Click the Edit link on an article and submit a pull request to the <a href="https://github.com/Microsoft/bot-framework-docs" target="_blank">Bot Framework documentation GitHub repo</a>.
+|**Reporting abuse**| Contact us at [[email protected]](mailto://[email protected])

articles/resources-tools-downloads.md

@@ -36,6 +36,9 @@ Download Visual Studio project templates to accelerate bot development.
 * [Bot template for Visual Studio][bot-template] for developing bots with C#
 * [Cortana skill template for Visual Studio][cortana-template] for developing Cortana skills with C#
 
+> [!TIP]
+> <a href="https://docs.microsoft.com/en-us/visualstudio/ide/how-to-locate-and-organize-project-and-item-templates" target="_blank">Learn more</a> about how to install Visual Studio 2017 project templates.
+
 ## Bot Builder SDK for Node.js
 The Bot Builder SDK for Node.js provides a familiar way for Node.js developers to write bots. You can use it to build a wide variety of conversational user interfaces, from simple prompts to free-form conversations. The Bot Builder SDK for Node.js uses restify, a popular framework for building web services, to create the bot's web server. The SDK is also compatible with Express.
 

styleguide/filenames.md

@@ -5,9 +5,9 @@ URLs must be consistent, hierarchical, and as shallow as possible to perform wel
 To ensure well-structured URLs, use one of following URL patterns:
 
 
-    https://docs.microsoft.com/en-us/botframework/{technology}/{filename}
+    https://docs.microsoft.com/en-us/bot-framework/{technology}/{filename}
 
-    https://docs.microsoft.com/en-us/botframework/{technology}/{userjourney-or-secondary-category}/{filename}
+    https://docs.microsoft.com/en-us/bot-framework/{technology}/{userjourney-or-secondary-category}/{filename}
     Use this option if the content set is large and requires deeper hierarchies.
 
 >[!IMPORTANT]
@@ -34,5 +34,5 @@ You may use industry-standard acronyms or abbreviations, such as DNS or URL. .
 
 Here are examples of descriptive, relevant file names:
 
-conversations-control-templates.md
-install-botbuilder-sdk.md
+bot-builder-dotnet-conversations-control-templates.md
+resources-install-botbuilder-sdk.md