Skip to content

Commit

Permalink
[repo] bump: dotnet to v1.3.0 (#1731)
Browse files Browse the repository at this point in the history
## 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
  • Loading branch information
singhk97 authored Jun 14, 2024
1 parent 1d469b3 commit 418299d
Show file tree
Hide file tree
Showing 23 changed files with 48 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public PredictedSayCommand(ChatMessage response)
Response = response;
}

/// <summary>
/// Creates a new instance of the <see cref="PredictedSayCommand"/> class.
/// </summary>
/// <param name="response">The response that the AI system should say.</param>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Nullable>enable</Nullable>
<PackageId>Microsoft.Teams.AI</PackageId>
<Product>Microsoft Teams AI SDK</Product>
<Version>1.3.0</Version>
<Version>1.4.0</Version>
<Authors>Microsoft</Authors>
<Company>Microsoft</Company>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/01.messaging.echoBot/EchoBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
8 changes: 4 additions & 4 deletions dotnet/samples/04.ai.a.teamsChefBot/TeamsChefBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.4" />
<PackageReference Include="Microsoft.KernelMemory.AI.OpenAI" Version="0.26.240121.1" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.26.240121.1" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private async Task<string> 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>() ?? string.Empty;
}
catch (HttpOperationException e) when (e.StatusCode == HttpStatusCode.TooManyRequests)
{
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/04.ai.b.messageExtensions.gptME/GPT.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<ItemGroup>
<PackageReference Include="AdaptiveCards" Version="3.1.0" />
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Include prompt as content in build output -->
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/04.ai.c.actionMapping.lightBot/LightBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/04.ai.d.chainedActions.listBot/ListBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Include prompt as content in build output -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Include prompt as content in build output -->
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/04.ai.f.vision.cardMaster/CardGazer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/samples/04.e.twentyQuestions/GameBotHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private async Task<string> GetHint(ITurnContext turnContext, GameState turnState
if (response.Status == PromptResponseStatus.Success && response.Message != null)
{
// Prompt completed successfully
return response.Message.Content!;
return response.Message.GetContent<string>()!;
}

throw new Exception($"An error occured when trying to make a call to the AI service: {response.Error}");
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/04.e.twentyQuestions/TwentyQuestions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Include prompt as content in build output -->
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/06.assistants.a.mathBot/MathBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
<PackageReference Include="Azure.AI.OpenAI.Assistants" Version="1.0.0-beta.3" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/06.assistants.b.orderBot/OrderBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI.Assistants" Version="1.0.0-beta.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/06.auth.oauth.bot/BotAuth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="2.16.0" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Graph" Version="4.54.0" />
<PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="2.16.0" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
4 changes: 2 additions & 2 deletions dotnet/samples/06.auth.teamsSSO.bot/BotAuth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.3.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="2.16.0" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.4.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Graph" Version="4.54.0" />
<PackageReference Include="Microsoft.Identity.Web.TokenCache" Version="2.16.0" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

<ItemGroup>
<PackageReference Include="Azure.Search.Documents" Version="11.6.0-beta.3" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.3" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.3" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.3.*" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.22.4" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.22.4" />
<PackageReference Include="Microsoft.Teams.AI" Version="1.4.*" />
</ItemGroup>

<!-- Exclude Teams Toolkit files from build output, but can still be viewed from Solution Explorer -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static AdaptiveCard CreateResponseCard(PromptResponse response)
});
}

var formattedText = FormatResponse(response.Message!.Content);
var formattedText = FormatResponse(response.Message!.GetContent<string>());

var adaptiveCard = new AdaptiveCard(new AdaptiveSchemaVersion(1, 5))
{
Expand Down

0 comments on commit 418299d

Please sign in to comment.