Merge branch 'main' into v-gandiddi/AddChannels

microsoft · Jul 24, 2024 · db0949e · db0949e
2 parents 11d34c8 + a2cccb3
commit db0949e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/...otbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py b/...otbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py
@@ -116,6 +116,7 @@ async def _post_content(
     ) -> Tuple[int, object]:
         headers_dict = {
             "Content-type": "application/json; charset=utf-8",
+            "x-ms-conversation-id": activity.conversation.id,
         }
         if token:
             headers_dict.update(

diff --git a/...-connector/botframework/connector/aio/operations_async/_conversations_operations_async.py b/...-connector/botframework/connector/aio/operations_async/_conversations_operations_async.py
@@ -510,6 +510,7 @@ async def reply_to_activity(
         header_parameters = {}
         header_parameters["Accept"] = "application/json"
         header_parameters["Content-Type"] = "application/json; charset=utf-8"
+        header_parameters["x-ms-conversation-id"] = conversation_id
         if custom_headers:
             header_parameters.update(custom_headers)
 

diff --git a/...ies/botframework-connector/botframework/connector/operations/_conversations_operations.py b/...ies/botframework-connector/botframework/connector/operations/_conversations_operations.py
@@ -495,6 +495,7 @@ def reply_to_activity(
         header_parameters = {}
         header_parameters["Accept"] = "application/json"
         header_parameters["Content-Type"] = "application/json; charset=utf-8"
+        header_parameters["x-ms-conversation-id"] = conversation_id
         if custom_headers:
             header_parameters.update(custom_headers)