From 015143fbb522bbd97bcd4d32b631a55a9fb50a77 Mon Sep 17 00:00:00 2001 From: Corina <14900841+corinagum@users.noreply.github.com> Date: Tue, 25 Aug 2026 10:55:30 -0700 Subject: [PATCH 1/3] Comments should reference the service if required --- samples/PABot/Bots/SsoBot.cs | 2 +- src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs | 2 +- test/IntegrationTests/README.md | 2 +- .../CompatConversationsTests.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/PABot/Bots/SsoBot.cs b/samples/PABot/Bots/SsoBot.cs index b53a85755..b015628b3 100644 --- a/samples/PABot/Bots/SsoBot.cs +++ b/samples/PABot/Bots/SsoBot.cs @@ -362,7 +362,7 @@ private async Task TestOAuthCardSendScenario(ITurnContext turn logger.LogInformation($"ConversationId: {activity.Conversation.Id}"); logger.LogInformation($"Recipient: {activity.Recipient.Id}"); - // This is the call that causes NullReferenceException when APX returns 202 with empty body + // This is the call that causes NullReferenceException when the service returns 202 with empty body ResourceResponse response = await connectorClient.Conversations.SendToConversationAsync( (Microsoft.Bot.Schema.Activity)activity, cancellationToken diff --git a/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs b/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs index 2d095ce94..54a90acc3 100644 --- a/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs +++ b/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs @@ -20,7 +20,7 @@ public static string ThreadId(this Conversation conversation) /// /// Construct a threaded conversation ID by appending ;messageid={messageId} - /// to the conversation ID. This is the format APX uses to route messages + /// to the conversation ID. This is the format the service uses to route messages /// to a specific thread in a channel. /// /// the conversation to thread into (e.g. 19:abc@thread.skype) diff --git a/test/IntegrationTests/README.md b/test/IntegrationTests/README.md index 9ecdff31c..1cd3b5685 100644 --- a/test/IntegrationTests/README.md +++ b/test/IntegrationTests/README.md @@ -1,6 +1,6 @@ # Teams SDK Integration Tests -This project runs integration tests against Teams Server (SMBA/APX) using bot and agentic identities. +This project runs integration tests against Teams Server (SMBA) using bot and agentic identities. ## Prerequisites diff --git a/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs b/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs index d769e43ea..bb07c6c77 100644 --- a/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs +++ b/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs @@ -400,7 +400,7 @@ public async Task ReplyToActivityWithHttpMessagesAsync_SetsReplyToIdProperty() public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId() { // This test verifies the fix for the OAuth card null reference bug - // When APX returns 202 Accepted with no body, SendActivityAsync returns null + // When the service returns 202 Accepted with no body, SendActivityAsync returns null // We should return string.Empty for Id instead of null to maintain API contract // Arrange @@ -433,7 +433,7 @@ public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturn public async Task ReplyToActivityWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId() { // This test verifies the fix for the OAuth card null reference bug in ReplyToActivity - // When APX returns 202 Accepted with no body, SendActivityAsync returns null + // When the service returns 202 Accepted with no body, SendActivityAsync returns null // We should return string.Empty for Id instead of null to maintain API contract // Arrange From 3939f035bcef33ed8979ecf8d57329f350cec0bd Mon Sep 17 00:00:00 2001 From: Corina <14900841+corinagum@users.noreply.github.com> Date: Tue, 25 Aug 2026 11:01:23 -0700 Subject: [PATCH 2/3] Addendum --- test/IntegrationTests/README.md | 2 +- .../Http/BotRequestContextTests.cs | 2 +- test/TeamsApisDemo/Program.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/IntegrationTests/README.md b/test/IntegrationTests/README.md index 1cd3b5685..965938ae8 100644 --- a/test/IntegrationTests/README.md +++ b/test/IntegrationTests/README.md @@ -1,6 +1,6 @@ # Teams SDK Integration Tests -This project runs integration tests against Teams Server (SMBA) using bot and agentic identities. +This project runs integration tests against Teams Server using bot and agentic identities. ## Prerequisites diff --git a/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs b/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs index 9252256bd..b55c9fd4e 100644 --- a/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs +++ b/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs @@ -176,7 +176,7 @@ public void FromInboundActivity_IgnoresAgenticFieldsOnSender() [Fact] public void FromInboundActivity_FallsBackToRecipientId_WhenBotIdAbsent() { - // Standard (non-agentic) inbound activity: SMBA does not populate BotId, but Recipient.Id + // Standard (non-agentic) inbound activity: the service does not populate BotId, but Recipient.Id // carries the Teams-style "28:" value. CoreActivity activity = new() { diff --git a/test/TeamsApisDemo/Program.cs b/test/TeamsApisDemo/Program.cs index c727dcbb8..4774fdb77 100644 --- a/test/TeamsApisDemo/Program.cs +++ b/test/TeamsApisDemo/Program.cs @@ -26,8 +26,8 @@ Console.WriteLine($"Running Teams Bot Application for appId '{teamsBotApplication.AppId}' with version '{TeamsBotApplication.Version}'."); -var smba = new Uri("https://smba.trafficmanager.net/amer"); -var conversations = teamsBotApplication.Api.ForServiceUrl(smba).Conversations; +var serviceUrl = new Uri("https://smba.trafficmanager.net/amer"); +var conversations = teamsBotApplication.Api.ForServiceUrl(serviceUrl).Conversations; int pages = 1; string cid = "19%3ALydFnezGKSkhYoiLNP6kZ8AuXQr36EDAkvG9CNJSPKc1%40thread.tacv2"; From 75d6fc5bd10dede2d1dac2e11e4172c20e1c6941 Mon Sep 17 00:00:00 2001 From: Corina <14900841+corinagum@users.noreply.github.com> Date: Tue, 25 Aug 2026 11:40:54 -0700 Subject: [PATCH 3/3] Use "the Teams service" in comments Review feedback: "the service" is ambiguous because the code itself runs in a service. Comments only, no behavior change. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- samples/PABot/Bots/SsoBot.cs | 2 +- src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs | 2 +- .../CompatConversationsTests.cs | 4 ++-- .../Http/BotRequestContextTests.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/PABot/Bots/SsoBot.cs b/samples/PABot/Bots/SsoBot.cs index b015628b3..8bdc82daa 100644 --- a/samples/PABot/Bots/SsoBot.cs +++ b/samples/PABot/Bots/SsoBot.cs @@ -362,7 +362,7 @@ private async Task TestOAuthCardSendScenario(ITurnContext turn logger.LogInformation($"ConversationId: {activity.Conversation.Id}"); logger.LogInformation($"Recipient: {activity.Recipient.Id}"); - // This is the call that causes NullReferenceException when the service returns 202 with empty body + // This is the call that causes NullReferenceException when the Teams service returns 202 with empty body ResourceResponse response = await connectorClient.Conversations.SendToConversationAsync( (Microsoft.Bot.Schema.Activity)activity, cancellationToken diff --git a/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs b/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs index 54a90acc3..98182af3c 100644 --- a/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs +++ b/src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs @@ -20,7 +20,7 @@ public static string ThreadId(this Conversation conversation) /// /// Construct a threaded conversation ID by appending ;messageid={messageId} - /// to the conversation ID. This is the format the service uses to route messages + /// to the conversation ID. This is the format the Teams service uses to route messages /// to a specific thread in a channel. /// /// the conversation to thread into (e.g. 19:abc@thread.skype) diff --git a/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs b/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs index bb07c6c77..30112377a 100644 --- a/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs +++ b/test/Microsoft.Teams.Apps.BotBuilder.UnitTests/CompatConversationsTests.cs @@ -400,7 +400,7 @@ public async Task ReplyToActivityWithHttpMessagesAsync_SetsReplyToIdProperty() public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId() { // This test verifies the fix for the OAuth card null reference bug - // When the service returns 202 Accepted with no body, SendActivityAsync returns null + // When the Teams service returns 202 Accepted with no body, SendActivityAsync returns null // We should return string.Empty for Id instead of null to maintain API contract // Arrange @@ -433,7 +433,7 @@ public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturn public async Task ReplyToActivityWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId() { // This test verifies the fix for the OAuth card null reference bug in ReplyToActivity - // When the service returns 202 Accepted with no body, SendActivityAsync returns null + // When the Teams service returns 202 Accepted with no body, SendActivityAsync returns null // We should return string.Empty for Id instead of null to maintain API contract // Arrange diff --git a/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs b/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs index b55c9fd4e..f09f605e3 100644 --- a/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs +++ b/test/Microsoft.Teams.Core.UnitTests/Http/BotRequestContextTests.cs @@ -176,7 +176,7 @@ public void FromInboundActivity_IgnoresAgenticFieldsOnSender() [Fact] public void FromInboundActivity_FallsBackToRecipientId_WhenBotIdAbsent() { - // Standard (non-agentic) inbound activity: the service does not populate BotId, but Recipient.Id + // Standard (non-agentic) inbound activity: the Teams service does not populate BotId, but Recipient.Id // carries the Teams-style "28:" value. CoreActivity activity = new() {