Skip to content

Update chat template dependencies, fix OpenAI/Aspire config, and address build warnings #6280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Apr 16, 2025
Merged

Update chat template dependencies, fix OpenAI/Aspire config, and address build warnings #6280

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f1bf561
Update chat template dependencies
MackinnonBuck Apr 10, 2025
0cf84cd
Update test snapshots
MackinnonBuck Apr 10, 2025
2760c6a
Update Aspire version
MackinnonBuck Apr 10, 2025
c237e98
Revert Aspire + update CommunityToolkit.Aspire
MackinnonBuck Apr 11, 2025
7e8e3c8
Merge branch 'main' into mbuck/template-version-update
MackinnonBuck Apr 11, 2025
4c0cbec
Open README in VS after project creation
MackinnonBuck Apr 11, 2025
61fc8fe
Add Known Issue to Aspire README for Qdrant
jeffhandley Apr 14, 2025
814292e
Update survey template URL
jeffhandley Apr 14, 2025
ce20e62
Set the Project Template package version to -preview.2
jeffhandley Apr 14, 2025
5dc64a1
Update template baseline
jeffhandley Apr 14, 2025
6e54257
Update template pinned versions
jozkee Apr 15, 2025
fa2f5d7
Do not append template args to snapshot names
jeffhandley Apr 15, 2025
246d017
Fix vector store index in the README. Add an AzureAISearch template t…
jeffhandley Apr 15, 2025
146d47a
Add a note to the Aspire README for trusting the development certificate
jeffhandley Apr 15, 2025
095b5bd
Use AddOpenAIClient for OpenAI and AddAzureOpenAIClient for Azure OpenAI
jeffhandley Apr 15, 2025
e8fb578
Remove duplicated using System.ClientModel
jozkee Apr 15, 2025
28e9922
Update Aspire README to specify the exception thrown for the known issue
jeffhandley Apr 16, 2025
f17d83b
Augment the Aspire README for more Docker notes for Ollama and Qdrant
jeffhandley Apr 16, 2025
65db551
Fix Microsoft.Extensions.Http.Resilience warnings with separate pinne…
jeffhandley Apr 16, 2025
c301be0
Merge branch 'mbuck/template-version-update' of https://github.com/do…
jeffhandley Apr 16, 2025
abf2b41
Merge branch 'main' into mbuck/template-version-update
jeffhandley Apr 16, 2025
5e8ae22
Update test baseline for: Rename EmbeddingGeneratorExtensions.Generat…
jeffhandley Apr 16, 2025
bb0e614
Add --managed-identity to the template developer README
jeffhandley Apr 16, 2025
790b784
Merge branch 'main' into mbuck/template-version-update
jeffhandley Apr 16, 2025
4b6e9d7
Apply the Ollama timeout recommendation in the template code
jeffhandley Apr 16, 2025
73ca9d7
Call http.RemoveAllResilienceHandlers before adding the handler
jeffhandley Apr 16, 2025
333faa0
Update template test baseline
jeffhandley Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,21 @@
<MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
<!-- AI templates -->
<AspireVersion>9.1.0</AspireVersion>
<AspireAzureAIOpenAIVersion>9.1.0-preview.1.25121.10</AspireAzureAIOpenAIVersion>
<AzureAIProjectsVersion>1.0.0-beta.3</AzureAIProjectsVersion>
<AspireVersion>9.2.0</AspireVersion>
<AspireAzureAIOpenAIVersion>9.2.0-preview.1.25209.2</AspireAzureAIOpenAIVersion>
<AzureAIProjectsVersion>1.0.0-beta.6</AzureAIProjectsVersion>
<AzureAIOpenAIVersion>2.2.0-beta.4</AzureAIOpenAIVersion>
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
<AzureSearchDocumentsVersion>11.6.0</AzureSearchDocumentsVersion>
<CommunityToolkitAspireHostingOllamaVersion>9.2.2-beta.236</CommunityToolkitAspireHostingOllamaVersion>
<CommunityToolkitAspireHostingSqliteVersion>9.2.2-beta.236</CommunityToolkitAspireHostingSqliteVersion>
<CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion>9.2.2-beta.236</CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion>
<CommunityToolkitAspireOllamaSharpVersion>9.2.2-beta.236</CommunityToolkitAspireOllamaSharpVersion>
<MicrosoftExtensionsServiceDiscoveryVersion>9.1.0</MicrosoftExtensionsServiceDiscoveryVersion>
<MicrosoftSemanticKernelConnectorsAzureAISearchVersion>1.41.0-preview</MicrosoftSemanticKernelConnectorsAzureAISearchVersion>
<MicrosoftSemanticKernelConnectorsQdrantVersion>1.41.0-preview</MicrosoftSemanticKernelConnectorsQdrantVersion>
<MicrosoftSemanticKernelCoreVersion>1.41.0</MicrosoftSemanticKernelCoreVersion>
<OllamaSharpVersion>5.1.9</OllamaSharpVersion>
<MicrosoftExtensionsServiceDiscoveryVersion>9.2.0</MicrosoftExtensionsServiceDiscoveryVersion>
<MicrosoftSemanticKernelConnectorsAzureAISearchVersion>1.45.0-preview</MicrosoftSemanticKernelConnectorsAzureAISearchVersion>
<MicrosoftSemanticKernelConnectorsQdrantVersion>1.45.0-preview</MicrosoftSemanticKernelConnectorsQdrantVersion>
<MicrosoftSemanticKernelCoreVersion>1.45.0</MicrosoftSemanticKernelCoreVersion>
<OllamaSharpVersion>5.1.12</OllamaSharpVersion>
<OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
<PdfPigVersion>0.1.9</PdfPigVersion>
<SystemLinqAsyncVersion>6.0.1</SystemLinqAsyncVersion>
Expand Down
2 changes: 1 addition & 1 deletion ....Templates.IntegrationTests/Snapshots/aichatweb.Basic.verified/aichatweb/aichatweb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.5.0" />
<PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.41.0" />
<PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.45.0" />
<PackageReference Include="PdfPig" Version="0.1.9" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...chatweb.BasicAspire--aspire.verified/aichatweb/aichatweb.AppHost/aichatweb.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
<Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Sqlite" Version="9.2.2-beta.236" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...ire--aspire.verified/aichatweb/aichatweb.ServiceDefaults/aichatweb.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
Expand Down
4 changes: 2 additions & 2 deletions ...shots/aichatweb.BasicAspire--aspire.verified/aichatweb/aichatweb.Web/aichatweb.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Azure.AI.OpenAI" Version="9.1.0-preview.1.25121.10" />
<PackageReference Include="Aspire.Azure.AI.OpenAI" Version="9.2.0-preview.1.25209.2" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0" />
<PackageReference Include="CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite" Version="9.2.2-beta.236" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.5.0" />
<PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.41.0" />
<PackageReference Include="Microsoft.SemanticKernel.Core" Version="1.45.0" />
<PackageReference Include="PdfPig" Version="0.1.9" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>
Expand Down
Loading