From 418299d175aae9e2ee4b545f1ea6894874e37c76 Mon Sep 17 00:00:00 2001
From: kavin <115390646+singhk97@users.noreply.github.com>
Date: Fri, 14 Jun 2024 13:48:25 -0700
Subject: [PATCH] [repo] bump: dotnet to v1.3.0 (#1731)
## Linked issues
closes: #minor
## Details
Updated samples to reference v1.4.0 and fixed failing builds.
## Attestation Checklist
- [x] My code follows the style guidelines of this project
- I have checked for/fixed spelling, linting, and other errors
- I have commented my code for clarity
- I have made corresponding changes to the documentation (updating the
doc strings in the code is sufficient)
- My changes generate no new warnings
- I have added tests that validates my changes, and provides sufficient
test coverage. I have tested with:
- Local testing
- E2E testing in Teams
- New and existing unit tests pass locally with my changes
---
.../Microsoft.TeamsAI/AI/Planners/PredictedSayCommand.cs | 1 +
.../Microsoft.TeamsAI/Microsoft.Teams.AI.csproj | 2 +-
dotnet/samples/01.messaging.echoBot/EchoBot.csproj | 4 ++--
.../SearchCommand.csproj | 4 ++--
.../03.adaptiveCards.a.typeAheadBot/TypeAheadBot.csproj | 6 +++---
dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj | 8 ++++----
.../04.ai.b.messageExtensions.gptME/ActivityHandlers.cs | 2 +-
dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj | 4 ++--
.../04.ai.c.actionMapping.lightBot/LightBot.csproj | 4 ++--
.../samples/04.ai.d.chainedActions.listBot/ListBot.csproj | 4 ++--
.../04.ai.e.chainedActions.devOpsBot/DevOpsBot.csproj | 4 ++--
dotnet/samples/04.ai.f.vision.cardMaster/CardGazer.csproj | 4 ++--
dotnet/samples/04.e.twentyQuestions/GameBotHandlers.cs | 2 +-
.../samples/04.e.twentyQuestions/TwentyQuestions.csproj | 4 ++--
dotnet/samples/06.assistants.a.mathBot/MathBot.csproj | 4 ++--
dotnet/samples/06.assistants.b.orderBot/OrderBot.csproj | 4 ++--
dotnet/samples/06.auth.oauth.bot/BotAuth.csproj | 4 ++--
.../MessageExtensionAuth.csproj | 4 ++--
dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj | 4 ++--
.../MessageExtensionAuth.csproj | 4 ++--
.../AzureAISearchBot/AzureAISearchBot.csproj | 8 ++++----
.../08.datasource.azureopenai/AzureOpenAIBot.csproj | 8 ++++----
.../08.datasource.azureopenai/ResponseCardCreator.cs | 2 +-
23 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Planners/PredictedSayCommand.cs b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Planners/PredictedSayCommand.cs
index 586b0640a..00199807f 100644
--- a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Planners/PredictedSayCommand.cs
+++ b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Planners/PredictedSayCommand.cs
@@ -33,6 +33,7 @@ public PredictedSayCommand(ChatMessage response)
Response = response;
}
+ ///
/// Creates a new instance of the class.
///
/// The response that the AI system should say.
diff --git a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj
index 7677c5686..bb9b382e1 100644
--- a/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj
+++ b/dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj
@@ -7,7 +7,7 @@
enable
Microsoft.Teams.AI
Microsoft Teams AI SDK
- 1.3.0
+ 1.4.0
Microsoft
Microsoft
© Microsoft Corporation. All rights reserved.
diff --git a/dotnet/samples/01.messaging.echoBot/EchoBot.csproj b/dotnet/samples/01.messaging.echoBot/EchoBot.csproj
index cc4547fcb..151e097bf 100644
--- a/dotnet/samples/01.messaging.echoBot/EchoBot.csproj
+++ b/dotnet/samples/01.messaging.echoBot/EchoBot.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/SearchCommand.csproj b/dotnet/samples/02.messageExtensions.a.searchCommand/SearchCommand.csproj
index 67fa4d43a..7dcfead4c 100644
--- a/dotnet/samples/02.messageExtensions.a.searchCommand/SearchCommand.csproj
+++ b/dotnet/samples/02.messageExtensions.a.searchCommand/SearchCommand.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/TypeAheadBot.csproj b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/TypeAheadBot.csproj
index 58866497a..ada043ed1 100644
--- a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/TypeAheadBot.csproj
+++ b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/TypeAheadBot.csproj
@@ -11,9 +11,9 @@
-
-
-
+
+
+
diff --git a/dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj b/dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj
index cbc90f8be..c728d139f 100644
--- a/dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj
+++ b/dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj
@@ -11,12 +11,12 @@
-
-
-
+
+
+
-
+
diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/ActivityHandlers.cs b/dotnet/samples/04.ai.b.messageExtensions.gptME/ActivityHandlers.cs
index 8be674028..7361e63a7 100644
--- a/dotnet/samples/04.ai.b.messageExtensions.gptME/ActivityHandlers.cs
+++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/ActivityHandlers.cs
@@ -165,7 +165,7 @@ private async Task UpdatePost(ITurnContext context, AppState state, stri
throw new Exception($"The LLM request had the following error: {res?.Error?.Message}");
}
- return res?.Message?.Content ?? string.Empty;
+ return res?.Message?.GetContent() ?? string.Empty;
}
catch (HttpOperationException e) when (e.StatusCode == HttpStatusCode.TooManyRequests)
{
diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj b/dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj
index 6aa752d89..e51167826 100644
--- a/dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj
+++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/LightBot.csproj b/dotnet/samples/04.ai.c.actionMapping.lightBot/LightBot.csproj
index b9ac7c8d6..d4fef2ce6 100644
--- a/dotnet/samples/04.ai.c.actionMapping.lightBot/LightBot.csproj
+++ b/dotnet/samples/04.ai.c.actionMapping.lightBot/LightBot.csproj
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/ListBot.csproj b/dotnet/samples/04.ai.d.chainedActions.listBot/ListBot.csproj
index 89a710147..bfd1f9c60 100644
--- a/dotnet/samples/04.ai.d.chainedActions.listBot/ListBot.csproj
+++ b/dotnet/samples/04.ai.d.chainedActions.listBot/ListBot.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/DevOpsBot.csproj b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/DevOpsBot.csproj
index 511164513..263137910 100644
--- a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/DevOpsBot.csproj
+++ b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/DevOpsBot.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/dotnet/samples/04.ai.f.vision.cardMaster/CardGazer.csproj b/dotnet/samples/04.ai.f.vision.cardMaster/CardGazer.csproj
index 2006f835e..1692da6ea 100644
--- a/dotnet/samples/04.ai.f.vision.cardMaster/CardGazer.csproj
+++ b/dotnet/samples/04.ai.f.vision.cardMaster/CardGazer.csproj
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/dotnet/samples/04.e.twentyQuestions/GameBotHandlers.cs b/dotnet/samples/04.e.twentyQuestions/GameBotHandlers.cs
index db05b12c4..304e6e797 100644
--- a/dotnet/samples/04.e.twentyQuestions/GameBotHandlers.cs
+++ b/dotnet/samples/04.e.twentyQuestions/GameBotHandlers.cs
@@ -91,7 +91,7 @@ private async Task GetHint(ITurnContext turnContext, GameState turnState
if (response.Status == PromptResponseStatus.Success && response.Message != null)
{
// Prompt completed successfully
- return response.Message.Content!;
+ return response.Message.GetContent()!;
}
throw new Exception($"An error occured when trying to make a call to the AI service: {response.Error}");
diff --git a/dotnet/samples/04.e.twentyQuestions/TwentyQuestions.csproj b/dotnet/samples/04.e.twentyQuestions/TwentyQuestions.csproj
index 28d91643a..d73bf6122 100644
--- a/dotnet/samples/04.e.twentyQuestions/TwentyQuestions.csproj
+++ b/dotnet/samples/04.e.twentyQuestions/TwentyQuestions.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/dotnet/samples/06.assistants.a.mathBot/MathBot.csproj b/dotnet/samples/06.assistants.a.mathBot/MathBot.csproj
index 33c8b698d..426a47abc 100644
--- a/dotnet/samples/06.assistants.a.mathBot/MathBot.csproj
+++ b/dotnet/samples/06.assistants.a.mathBot/MathBot.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/dotnet/samples/06.assistants.b.orderBot/OrderBot.csproj b/dotnet/samples/06.assistants.b.orderBot/OrderBot.csproj
index 4add46c70..48dc5dcc2 100644
--- a/dotnet/samples/06.assistants.b.orderBot/OrderBot.csproj
+++ b/dotnet/samples/06.assistants.b.orderBot/OrderBot.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/dotnet/samples/06.auth.oauth.bot/BotAuth.csproj b/dotnet/samples/06.auth.oauth.bot/BotAuth.csproj
index 7b8be6464..11f7181b3 100644
--- a/dotnet/samples/06.auth.oauth.bot/BotAuth.csproj
+++ b/dotnet/samples/06.auth.oauth.bot/BotAuth.csproj
@@ -16,9 +16,9 @@
-
+
-
+
diff --git a/dotnet/samples/06.auth.oauth.messageExtension/MessageExtensionAuth.csproj b/dotnet/samples/06.auth.oauth.messageExtension/MessageExtensionAuth.csproj
index c4f81775c..476f68dda 100644
--- a/dotnet/samples/06.auth.oauth.messageExtension/MessageExtensionAuth.csproj
+++ b/dotnet/samples/06.auth.oauth.messageExtension/MessageExtensionAuth.csproj
@@ -13,10 +13,10 @@
-
+
-
+
diff --git a/dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj b/dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj
index 716b838f1..01abf8656 100644
--- a/dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj
+++ b/dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj
@@ -16,9 +16,9 @@
-
+
-
+
diff --git a/dotnet/samples/06.auth.teamsSSO.messageExtension/MessageExtensionAuth.csproj b/dotnet/samples/06.auth.teamsSSO.messageExtension/MessageExtensionAuth.csproj
index e5494af4f..97fdd0128 100644
--- a/dotnet/samples/06.auth.teamsSSO.messageExtension/MessageExtensionAuth.csproj
+++ b/dotnet/samples/06.auth.teamsSSO.messageExtension/MessageExtensionAuth.csproj
@@ -13,10 +13,10 @@
-
+
-
+
diff --git a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/AzureAISearchBot.csproj b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/AzureAISearchBot.csproj
index 296caacb6..57782e173 100644
--- a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/AzureAISearchBot.csproj
+++ b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/AzureAISearchBot.csproj
@@ -12,10 +12,10 @@
-
-
-
-
+
+
+
+
diff --git a/dotnet/samples/08.datasource.azureopenai/AzureOpenAIBot.csproj b/dotnet/samples/08.datasource.azureopenai/AzureOpenAIBot.csproj
index 380698ceb..092c1fa3f 100644
--- a/dotnet/samples/08.datasource.azureopenai/AzureOpenAIBot.csproj
+++ b/dotnet/samples/08.datasource.azureopenai/AzureOpenAIBot.csproj
@@ -11,10 +11,10 @@
-
-
-
-
+
+
+
+
diff --git a/dotnet/samples/08.datasource.azureopenai/ResponseCardCreator.cs b/dotnet/samples/08.datasource.azureopenai/ResponseCardCreator.cs
index e0c860c4d..642147960 100644
--- a/dotnet/samples/08.datasource.azureopenai/ResponseCardCreator.cs
+++ b/dotnet/samples/08.datasource.azureopenai/ResponseCardCreator.cs
@@ -39,7 +39,7 @@ public static AdaptiveCard CreateResponseCard(PromptResponse response)
});
}
- var formattedText = FormatResponse(response.Message!.Content);
+ var formattedText = FormatResponse(response.Message!.GetContent());
var adaptiveCard = new AdaptiveCard(new AdaptiveSchemaVersion(1, 5))
{