Latest swagger updates

libraries/Microsoft.Bot.Schema/Activity.cs

@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
@@ -176,7 +176,7 @@ public Activity()
             SemanticAction = semanticAction;
             CustomInit();
         }
-
+        
         /// <summary>
         /// An initialization method that performs custom operations like setting defaults
         /// </summary>
@@ -215,9 +215,8 @@ public Activity()
         public System.DateTimeOffset? LocalTimestamp { get; set; }
 
         /// <summary>
-        /// Gets or sets contains the name of the timezone in which the
-        /// message, in local time, expressed in IANA Time Zone database
-        /// format.
+        /// Gets or sets the name of the local timezone of the message,
+        /// expressed in IANA Time Zone database format.
         /// For example, America/Los_Angeles.
         /// </summary>
         [JsonProperty(PropertyName = "localTimezone")]
@@ -472,5 +471,14 @@ public Activity()
         [JsonProperty(PropertyName = "semanticAction")]
         public SemanticAction SemanticAction { get; set; }
 
+        /// <summary>
+        /// Gets or sets a string containing an IRI identifying the caller of a bot. 
+        /// This field is not intended to be transmitted over the wire, but is 
+        /// instead populated by bots and clients based on cryptographically 
+        /// verifiable data that asserts the identity of the callers (e.g. tokens).
+        /// </summary>
+        [JsonProperty(PropertyName = "callerId")]
+        public string CallerId { get; set; }
+
     }
 }

libraries/Microsoft.Bot.Schema/AttachmentView.cs

@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
@@ -29,8 +29,8 @@ public AttachmentView()
         /// <summary>
         /// Initializes a new instance of the AttachmentView class.
         /// </summary>
-        /// <param name="viewId">Content type of the attachment</param>
-        /// <param name="size">Name of the attachment</param>
+        /// <param name="viewId">Id of the attachment</param>
+        /// <param name="size">Size of the attachment</param>
         public AttachmentView(string viewId = default(string), int? size = default(int?))
         {
             ViewId = viewId;
@@ -44,13 +44,13 @@ public AttachmentView()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets content type of the attachment
+        /// Gets or sets id of the attachment
         /// </summary>
         [JsonProperty(PropertyName = "viewId")]
         public string ViewId { get; set; }
 
         /// <summary>
-        /// Gets or sets name of the attachment
+        /// Gets or sets size of the attachment
         /// </summary>
         [JsonProperty(PropertyName = "size")]
         public int? Size { get; set; }

libraries/Microsoft.Bot.Schema/ConversationAccount.cs

@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
@@ -14,7 +14,7 @@ namespace Microsoft.Bot.Schema
     using System.Linq;
 
     /// <summary>
-    /// Channel account information for a conversation
+    /// Conversation account represents the identity of the conversation within a channel
     /// </summary>
     public partial class ConversationAccount
     {

libraries/Microsoft.Bot.Schema/IActivity.cs

@@ -44,10 +44,13 @@ public interface IActivity
         DateTimeOffset? Timestamp { get; set; }
 
         /// <summary>
-        /// Gets or sets client time when message was sent (local time or UTC).
+        /// Gets or sets the local date and time of the message,
+        /// expressed in ISO-8601 format.
+        /// For example, 2016-09-23T13:07:49.4714686-07:00.
         /// </summary>
         /// <value>
-        /// Client time when message was sent (local time or UTC).
+        /// Local date and time of the message,
+        /// expressed in ISO-8601 format.
         /// </value>
         DateTimeOffset? LocalTimestamp { get; set; }
 

libraries/Microsoft.Bot.Schema/SemanticAction.cs

@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for
 // license information.
@@ -57,5 +57,11 @@ public SemanticAction()
         [JsonProperty(PropertyName = "entities")]
         public IDictionary<string, Entity> Entities { get; set; }
 
+        /// <summary>
+        /// Gets or sets state of this action. Allowed values: `start`,
+        /// `continue`, `done`.
+        /// </summary>
+        [JsonProperty(PropertyName = "state")]
+        public string State { get; set; }
     }
 }

libraries/Microsoft.Bot.Schema/SemanticActionStates.cs

@@ -0,0 +1,31 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Bot.Schema
+{
+    /// <summary>
+    /// Indicates whether the semantic action is starting, continuing, or done.
+    /// </summary>
+    public static class SemanticActionStates
+    {
+        /// <summary>
+        /// Semantic action is starting.
+        /// </summary>
+        public const string Start = "start";
+        /// <summary>
+        /// Semantic action is continuing.
+        /// </summary>
+        public const string Continue = "continue";
+        /// <summary>
+        /// Semantic action is done.
+        /// </summary>
+        public const string Done = "done";
+    }
+}

libraries/Swagger/ConnectorAPI.json

@@ -811,12 +811,12 @@
       "type": "object",
       "properties": {
         "viewId": {
-          "description": "Content type of the attachment",
+          "description": "Id of the attachment",
           "type": "string"
         },
         "size": {
           "format": "int32",
-          "description": "Name of the attachment",
+          "description": "Size of the attachment",
           "type": "integer"
         }
       }
@@ -887,17 +887,17 @@
           "description": "(Optional) Topic of the conversation (if supported by the channel)",
           "type": "string"
         },
+        "tenantId": {
+          "description": "(Optional) The tenant ID in which the conversation should be created",
+          "type": "string"
+        },
         "activity": {
           "$ref": "#/definitions/Activity",
           "description": "(Optional) When creating a new conversation, use this activity as the initial message to the conversation"
         },
         "channelData": {
           "description": "Channel specific payload for creating the conversation",
           "type": "object"
-        },
-        "tenantId":{
-          "description":"(Optional) The tenant ID in which the conversation should be created",
-          "type":"object"
         }
       }
     },
@@ -942,11 +942,15 @@
         },
         "localTimestamp": {
           "format": "date-time",
-          "description": "Contains the date and time that the message was sent, in local time, expressed in ISO-8601 format.\r\nFor example, 2016-09-23T13:07:49.4714686-07:00.",
+          "description": "Contains the local date and time of the message, expressed in ISO-8601 format.\r\nFor example, 2016-09-23T13:07:49.4714686-07:00.",
           "type": "string"
         },
         "localTimezone": {
-          "description": "Contains the name of the timezone in which the message, in local time, expressed in IANA Time Zone database format.\r\nFor example, America/Los_Angeles.",
+          "description": "Contains the name of the local timezone of the message, expressed in IANA Time Zone database format.\r\nFor example, America/Los_Angeles.",
+          "type": "string"
+        },
+        "callerId": {
+          "description": "A string containing an IRI identifying the caller of a bot. This field is not intended to be transmitted\r\nover the wire, but is instead populated by bots and clients based on cryptographically verifiable data\r\nthat asserts the identity of the callers (e.g. tokens).",
           "type": "string"
         },
         "serviceUrl": {
@@ -1121,7 +1125,7 @@
       }
     },
     "ConversationAccount": {
-      "description": "Channel account information for a conversation",
+      "description": "Conversation account represents the identity of the conversation within a channel",
       "type": "object",
       "properties": {
         "isGroup": {
@@ -1132,6 +1136,10 @@
           "description": "Indicates the type of the conversation in channels that distinguish between conversation types",
           "type": "string"
         },
+        "tenantId": {
+          "description": "This conversation's tenant ID",
+          "type": "string"
+        },
         "id": {
           "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or 123456)",
           "type": "string"
@@ -1147,10 +1155,6 @@
         "role": {
           "$ref": "#/definitions/RoleTypes",
           "description": "Role of the entity behind the account (Example: User, Bot, etc.)"
-        },
-        "tenantId": {
-          "description": "This conversation's tenant ID",
-          "type": "object"
         }
       }
     },
@@ -1269,6 +1273,10 @@
       "description": "Represents a reference to a programmatic action",
       "type": "object",
       "properties": {
+        "state": {
+          "$ref": "#/definitions/SemanticActionStates",
+          "description": "State of this action. Allowed values: `start`, `continue`, `done`"
+        },
         "id": {
           "description": "ID of this action",
           "type": "string"
@@ -2134,6 +2142,20 @@
         "modelAsString": true
       }
     },
+    "SemanticActionStates": {
+      "description": "Indicates whether the semantic action is starting, continuing, or done",
+      "enum": [
+        "start",
+        "continue",
+        "done"
+      ],
+      "type": "string",
+      "properties": {},
+      "x-ms-enum": {
+        "name": "SemanticActionStates",
+        "modelAsString": true
+      }
+    },
     "ActionTypes": {
       "description": "Defines action types for clickable buttons.",
       "enum": [