Merge branch 'master' into develop

CSharp/.gitignore

@@ -41,7 +41,7 @@ TestResult.xml
 dlldata.c
 
 # DNX
-project.lock.json
+*.lock.json
 artifacts/
 
 *_i.c

CSharp/Documentation/Doxyfile

@@ -631,7 +631,7 @@ SHOW_USED_FILES        = YES
 # (if specified).
 # The default value is: YES.
 
-SHOW_FILES             = YES
+SHOW_FILES             = NO
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
 # page. This will remove the Namespaces entry from the Quick Index and from the

CSharp/Documentation/GettingStarted.cs

@@ -76,7 +76,7 @@ Use the %Bot Framework Emulator to test your %Bot application
 The %Bot Framework provides a a channel emulator that lets you test calls to your %Bot as if it were being called 
 by the %Bot Framework cloud service. To install the %Bot Framework Emulator, download it from <strong><a href="https://aka.ms/bf-bc-emulator" target="_blank">here</a></strong>.
 
-One installed, you're ready to test. First, start your %Bot in Visual Studio using a browser as the application
+Once installed, you're ready to test. First, start your %Bot in Visual Studio using a browser as the application
 host. The image below uses %Microsoft Edge.
 
 ![Start your Bot in VS2015 targeting the browser](/en-us/images/connector/connector-getstarted-start-bot-locally.png)

CSharp/Documentation/StateAPI.cs

@@ -35,7 +35,10 @@ You can use these keys to store information in your own database as appropriate
 | **DeleteStateForUser()**         | User                       | When the user requests data be deleted or removes the %bot contact
 
 When your %bot sends a reply you simply set your object in one of the BotData records properties and it will be persisted and
-played back to you on future messages when the context is the same. 
+played back to you on future messages when the context is the same. Your bot may store data for a user, a conversation, or a single
+user within a conversation (called "private" data). Each payload may be up to 32 kilobytes in size. The data may be removed by 
+the bot or upon a user's request, e.g. if the user requests the channel to inform the bot (and therefore, the %Bot Framework) 
+to delete the user's data.
 
 > NOTE: If the record doesn't exist, it will return a new BotData() record with a null .Data field and an ETag = "*", so that is suitable for
 > changing and passing back to be saved

CSharp/Library/ConnectorEx/KeyboardCard.cs

@@ -40,7 +40,7 @@
 namespace Microsoft.Bot.Builder.ConnectorEx
 {
     /// <summary>
-    /// Card representing a keyboad
+    /// Card representing a keyboard
     /// </summary>
     /// <remarks>
     /// This will be mapped to <see cref="HeroCard"/> for all channels 

CSharp/Library/Dialogs/Address.cs

@@ -33,6 +33,7 @@
 
 using Microsoft.Bot.Builder.Internals.Fibers;
 using Microsoft.Bot.Connector;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 
@@ -69,6 +70,7 @@ public static Address FromActivity(IActivity activity)
                 );
         }
 
+        [JsonConstructor]
         public Address(string botId, string channelId, string userId, string conversationId, string serviceUrl)
         {
             SetField.CheckNull(nameof(botId), botId);

CSharp/Library/Microsoft.Bot.Builder.Calling/Models/Contracts/Recognize.cs

@@ -39,15 +39,15 @@ public class Recognize : ActionBase
         /// Default : 5 secs
         /// </summary>
         [JsonProperty(Required = Required.Default)]
-        public uint? InitialSilenceTimeoutInSeconds { get; set; }
+        public double? InitialSilenceTimeoutInSeconds { get; set; }
 
         /// <summary>
         /// Mamimum allowed time between digits if we are doing dtmf based choice recognition or CollectDigits recognition
         /// 
         /// Default : 1 sec
         /// </summary>
         [JsonProperty(Required = Required.Default)]
-        public uint? InterdigitTimeoutInSeconds { get; set; }
+        public double? InterdigitTimeoutInSeconds { get; set; }
 
         /// <summary>
         /// List of choices to recognize against. Choices can be speech or dtmf based.

CSharp/Library/Microsoft.Bot.Builder.Calling/Models/Contracts/Record.cs

@@ -22,7 +22,7 @@ public class Record : ActionBase
         /// Maximum duration of recording . Default : 180 secs
         /// </summary>
         [JsonProperty(Required = Required.Default)]
-        public uint? MaxDurationInSeconds { get; set; }
+        public double? MaxDurationInSeconds { get; set; }
 
         /// <summary>
         /// Maximum initial silence allowed from the time we start the recording operation 
@@ -31,7 +31,7 @@ public class Record : ActionBase
         /// Default : 5
         /// </summary>
         [JsonProperty(Required = Required.Default)]
-        public uint? InitialSilenceTimeoutInSeconds { get; set; }
+        public double? InitialSilenceTimeoutInSeconds { get; set; }
 
         /// <summary>
         /// Maximum allowed silence once the user has started speaking before we conclude 
@@ -40,7 +40,7 @@ public class Record : ActionBase
         /// Default : 1
         /// </summary>
         [JsonProperty(Required = Required.Default)]
-        public uint? MaxSilenceTimeoutInSeconds { get; set; }
+        public double? MaxSilenceTimeoutInSeconds { get; set; }
 
         /// <summary>
         /// The format is which the recording is expected.

CSharp/Library/Microsoft.Bot.Builder.Calling/Models/Misc/MinValues.cs

@@ -7,13 +7,13 @@ public static class MinValues
         /// <summary>
         /// JSON Content Type
         /// </summary>
-        public static readonly TimeSpan RecordingDuration = TimeSpan.FromSeconds(10);
+        public static readonly TimeSpan RecordingDuration = TimeSpan.FromSeconds(2.0);
 
         ///<summary>
         /// Minimum allowed silence once the user has started speaking before we conclude 
         /// the user is done recording.
         /// </summary>
-        public static readonly TimeSpan SilenceTimeout = TimeSpan.FromSeconds(1);
+        public static readonly TimeSpan SilenceTimeout = TimeSpan.FromSeconds(0.0);
 
         /// <summary>
         /// Minimum initial silence allowed from the time we start the operation 

CSharp/Library/Microsoft.Bot.Builder.nuspec

@@ -27,7 +27,7 @@
       <dependency id="Microsoft.AspNet.WebAPI.Core" version="5.2.3" />
       <dependency id="Microsoft.Rest.ClientRuntime" version="2.3.2" />
       <dependency id="Newtonsoft.Json" version="8.0.3" />
-      <dependency id="System.IdentityModel.Tokens.Jwt" version="4.0.2.206221351" />
+      <dependency id="System.IdentityModel.Tokens.Jwt" version="[4.0.2.206221351,5.0)" />
       <dependency id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.2.206221351" />
     </dependencies>
   </metadata>