Add Aspire support to chat template

.gitignore

@@ -316,3 +316,6 @@ BenchmarkDotNet.artifacts/
 *.binlog
 /eng/scripts/repo-digest.html
 **/.DS_Store
+
+# VERIFY
+!**/*.verified/**

eng/Versions.props

@@ -147,14 +147,23 @@
     <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>
-    <AzureAIOpenAIVersion>2.2.0-beta.1</AzureAIOpenAIVersion>
+    <AzureAIOpenAIVersion>2.2.0-beta.3</AzureAIOpenAIVersion>
     <AzureIdentityVersion>1.13.2</AzureIdentityVersion>
     <AzureSearchDocumentsVersion>11.6.0</AzureSearchDocumentsVersion>
-    <MicrosoftSemanticKernelConnectorsAzureAISearchVersion>1.37.0-preview</MicrosoftSemanticKernelConnectorsAzureAISearchVersion>
-    <MicrosoftSemanticKernelCoreVersion>1.37.0</MicrosoftSemanticKernelCoreVersion>
+    <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.5</OllamaSharpVersion>
-    <OpenAIVersion>2.2.0-beta.1</OpenAIVersion>
+    <OpenAIVersion>2.2.0-beta.3</OpenAIVersion>
+    <OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
     <PdfPigVersion>0.1.9</PdfPigVersion>
     <SystemLinqAsyncVersion>6.0.1</SystemLinqAsyncVersion>
     <!--

eng/build.sh

@@ -113,7 +113,7 @@ fi
 # - If more than one solution is found - fail.
 if [[ "$hasProjects" == false ]]; then
   repoRoot=$(realpath $DIR/../)
-  fileCount=$(find $repoRoot -path "$repoRoot/*.sln" | wc -l)
+  fileCount=$(find $repoRoot -path "$repoRoot/*.sln" -maxdepth 1 | wc -l)
   if [[ $fileCount > 1 ]]; then
     echo -e '\e[31m[ERROR] Multiple .sln files found in the root of the repository. Use '--projects' to specify the one you wish to build.\e[0m' >&2
     exit -1
@@ -154,4 +154,4 @@ if [[ "$testCoverage" == true ]]; then
   echo ""
   echo -e "\e[32mCode coverage results:\e[0m $testResultPath/CoverageResultsHtml/index.html"
   echo ""
-fi
+fi

src/ProjectTemplates/.gitignore

@@ -6,9 +6,10 @@ package-lock.json
 
 # Don't track files generated for debugging templates locally.
 */src/**/*.csproj
+*/src/**/*.sln
 */src/**/NuGet.config
 */src/**/Directory.Build.targets
-*/src/**/ingestioncache.db
+*/src/**/ingestioncache.*
 
 # launchSettings.json files are required for the templates.
 !launchSettings.json

src/ProjectTemplates/GeneratedContent.targets

@@ -1,28 +1,36 @@
 <Project>
 
   <PropertyGroup>
-    <_ChatWithCustomDataWebContentRoot>$(MSBuildThisFileDirectory)Microsoft.Extensions.AI.Templates\src\ChatWithCustomData\ChatWithCustomData.Web-CSharp\</_ChatWithCustomDataWebContentRoot>
+    <!--
+      Configures which chat template variant to use when debugging locally.
+      Options are:
+      - singleproject
+      - aspire
+    -->
+    <_LocalChatTemplateVariant>aspire</_LocalChatTemplateVariant>
+
+    <_ChatWithCustomDataContentRoot>$(MSBuildThisFileDirectory)Microsoft.Extensions.AI.Templates\src\ChatWithCustomData\</_ChatWithCustomDataContentRoot>
   </PropertyGroup>
 
   <Target Name="ComputeGeneratedContentProperties">
     <PropertyGroup>
       <!-- Define optional pinned versions of certain dependencies. -->
-      <TemplatePinnedMicrosoftExtensionsAIVersion>9.3.0-preview.1.25161.3</TemplatePinnedMicrosoftExtensionsAIVersion>
+      <TemplatePinnedRepoPackagesVersion>9.3.0-preview.1.25161.3</TemplatePinnedRepoPackagesVersion>
       <TemplatePinnedMicrosoftEntityFrameworkCoreSqliteVersion>9.0.3</TemplatePinnedMicrosoftEntityFrameworkCoreSqliteVersion>
 
       <!-- By default, use pinned dependency versions. -->
-      <TemplateUsePinnedMicrosoftExtensionsAIVersion Condition="'$(TemplateUsePinnedMicrosoftExtensionsAIVersion)' == ''">false</TemplateUsePinnedMicrosoftExtensionsAIVersion>
+      <TemplateUsePinnedRepoPackagesVersion Condition="'$(TemplateUsePinnedRepoPackagesVersion)' == ''">false</TemplateUsePinnedRepoPackagesVersion>
       <TemplateUsePinnedMicrosoftEntityFrameworkCoreSqliteVersion Condition="'$(TemplateUsePinnedMicrosoftEntityFrameworkCoreSqliteVersion)' == ''">false</TemplateUsePinnedMicrosoftEntityFrameworkCoreSqliteVersion>
 
       <!-- Apply pinned dependency versions if enabled. -->
-      <TemplateMicrosoftExtensionsAIVersion Condition="'$(TemplateUsePinnedMicrosoftExtensionsAIVersion)' == 'true'">$(TemplatePinnedMicrosoftExtensionsAIVersion)</TemplateMicrosoftExtensionsAIVersion>
+      <TemplateRepoPackagesVersion Condition="'$(TemplateUsePinnedRepoPackagesVersion)' == 'true'">$(TemplatePinnedRepoPackagesVersion)</TemplateRepoPackagesVersion>
       <TemplateMicrosoftEntityFrameworkCoreSqliteVersion Condition="'$(TemplateUsePinnedMicrosoftEntityFrameworkCoreSqliteVersion)' == 'true'">$(TemplatePinnedMicrosoftEntityFrameworkCoreSqliteVersion)</TemplateMicrosoftEntityFrameworkCoreSqliteVersion>
 
       <!-- Fall back on default dependency versions if pinned versions were not applied. -->
-      <TemplateMicrosoftExtensionsAIVersion Condition="'$(TemplateMicrosoftExtensionsAIVersion)' == ''">$(Version)</TemplateMicrosoftExtensionsAIVersion>
+      <TemplateRepoPackagesVersion Condition="'$(TemplateRepoPackagesVersion)' == ''">$(Version)</TemplateRepoPackagesVersion>
       <TemplateMicrosoftEntityFrameworkCoreSqliteVersion Condition="'$(TemplateMicrosoftEntityFrameworkCoreSqliteVersion)' == ''">$(MicrosoftEntityFrameworkCoreSqliteVersion)</TemplateMicrosoftEntityFrameworkCoreSqliteVersion>
 
-      <_TemplateUsingJustBuiltPackages Condition="'$(TemplateMicrosoftExtensionsAIVersion)' == '$(Version)'">true</_TemplateUsingJustBuiltPackages>
+      <_TemplateUsingJustBuiltPackages Condition="'$(TemplateRepoPackagesVersion)' == '$(Version)'">true</_TemplateUsingJustBuiltPackages>
 
       <!-- Specify package version variables used in template content. -->
       <GeneratedContentProperties>
@@ -32,33 +40,59 @@
         ArtifactsShippingPackagesDir=$(ArtifactsShippingPackagesDir);
 
         <!-- Package version properties -->
-        OllamaSharpVersion=$(OllamaSharpVersion);
-        OpenAIVersion=$(OpenAIVersion);
+        AspireVersion=$(AspireVersion);
+        AspireAzureAIOpenAIVersion=$(AspireAzureAIOpenAIVersion);
         AzureAIProjectsVersion=$(AzureAIProjectsVersion);
         AzureAIOpenAIVersion=$(AzureAIOpenAIVersion);
         AzureIdentityVersion=$(AzureIdentityVersion);
+        AzureSearchDocumentsVersion=$(AzureSearchDocumentsVersion);
+        CommunityToolkitAspireHostingOllamaVersion=$(CommunityToolkitAspireHostingOllamaVersion);
+        CommunityToolkitAspireHostingSqliteVersion=$(CommunityToolkitAspireHostingSqliteVersion);
+        CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion=$(CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion);
+        CommunityToolkitAspireOllamaSharpVersion=$(CommunityToolkitAspireOllamaSharpVersion);
         MicrosoftEntityFrameworkCoreSqliteVersion=$(TemplateMicrosoftEntityFrameworkCoreSqliteVersion);
-        MicrosoftExtensionsAIVersion=$(TemplateMicrosoftExtensionsAIVersion);
+        MicrosoftExtensionsAIVersion=$(TemplateRepoPackagesVersion);
+        MicrosoftExtensionsHttpResilienceVersion=$(TemplateRepoPackagesVersion);
+        MicrosoftExtensionsServiceDiscoveryVersion=$(MicrosoftExtensionsServiceDiscoveryVersion);
+        MicrosoftSemanticKernelConnectorsAzureAISearchVersion=$(MicrosoftSemanticKernelConnectorsAzureAISearchVersion);
+        MicrosoftSemanticKernelConnectorsQdrantVersion=$(MicrosoftSemanticKernelConnectorsQdrantVersion);
         MicrosoftSemanticKernelCoreVersion=$(MicrosoftSemanticKernelCoreVersion);
+        OllamaSharpVersion=$(OllamaSharpVersion);
+        OpenAIVersion=$(OpenAIVersion);
+        OpenTelemetryVersion=$(OpenTelemetryVersion);
         PdfPigVersion=$(PdfPigVersion);
         SystemLinqAsyncVersion=$(SystemLinqAsyncVersion);
-        AzureSearchDocumentsVersion=$(AzureSearchDocumentsVersion);
-        MicrosoftSemanticKernelConnectorsAzureAISearchVersion=$(MicrosoftSemanticKernelConnectorsAzureAISearchVersion);
+
+        <!-- Other properties -->
+        LocalChatTemplateVariant=$(_LocalChatTemplateVariant);
+        UsingJustBuiltPackages=$(_TemplateUsingJustBuiltPackages);
       </GeneratedContentProperties>
     </PropertyGroup>
 
     <ItemGroup>
       <GeneratedContent
-        Include="$(_ChatWithCustomDataWebContentRoot)ChatWithCustomData.Web-CSharp.csproj.in"
-        OutputPath="$(_ChatWithCustomDataWebContentRoot)ChatWithCustomData.Web-CSharp.csproj" />
+        Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.sln.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.sln" />
+      <GeneratedContent
+        Include="$(_ChatWithCustomDataContentRoot)Directory.Build.targets.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)Directory.Build.targets" />
+      <GeneratedContent
+        Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.Web\ChatWithCustomData-CSharp.Web.csproj.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.Web\ChatWithCustomData-CSharp.Web.csproj" />
+      <GeneratedContent
+        Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.Web\Directory.Build.targets.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.Web\Directory.Build.targets" />
+      <GeneratedContent
+        Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.AppHost\ChatWithCustomData-CSharp.AppHost.csproj.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.AppHost\ChatWithCustomData-CSharp.AppHost.csproj" />
+      <GeneratedContent
+        Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.ServiceDefaults\ChatWithCustomData-CSharp.ServiceDefaults.csproj.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.ServiceDefaults\ChatWithCustomData-CSharp.ServiceDefaults.csproj" />
 
       <!-- The following content only gets generated when using just-built packages -->
       <_GeneratedContentEnablingJustBuiltPackages
-        Include="$(_ChatWithCustomDataWebContentRoot)NuGet.config.in"
-        OutputPath="$(_ChatWithCustomDataWebContentRoot)NuGet.config" />
-      <_GeneratedContentEnablingJustBuiltPackages
-        Include="$(_ChatWithCustomDataWebContentRoot)Directory.Build.targets.in"
-        OutputPath="$(_ChatWithCustomDataWebContentRoot)Directory.Build.targets" />
+        Include="$(_ChatWithCustomDataContentRoot)NuGet.config.in"
+        OutputPath="$(_ChatWithCustomDataContentRoot)NuGet.config" />
 
       <GeneratedContent
         Include="@(_GeneratedContentEnablingJustBuiltPackages)"

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj

@@ -21,17 +21,27 @@
     <EnableDefaultItems>false</EnableDefaultItems>
     <NoDefaultExcludes>true</NoDefaultExcludes>
     <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
   </PropertyGroup>
 
-  <!--
-    Reference the GenerateTemplateContent project so that template content gets generated prior
-    to building this project.
-  -->
   <ItemGroup>
+    <!--
+      Reference the GenerateTemplateContent project so that template content gets generated prior
+      to building this project.
+    -->
     <ProjectReference
       Include="..\GenerateTemplateContent\GenerateTemplateContent.csproj"
       ReferenceOutputAssembly="false"
       PrivateAssets="all" />
+
+    <!--
+      Internal packages referenced by the templates that aren't in the AI workstream.
+      We include these references here so that local NuGet packages get generated for use by the templates.
+    -->
+    <ProjectReference
+      Include="..\..\Libraries\Microsoft.Extensions.Http.Resilience\Microsoft.Extensions.Http.Resilience.csproj"
+      ReferenceOutputAssembly="false"
+      PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,13 +51,14 @@
       Exclude="
         **\bin\**;
         **\obj\**;
+        **\.vs\**;
         **\node_modules\**;
         **\*.user;
         **\*.in;
         **\*.out.js;
         **\*.generated.css;
         **\package-lock.json;
-        **\ingestioncache.db;
+        **\ingestioncache.*;
         **\NuGet.config;
         **\Directory.Build.targets;" />
     <None Include="THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="." />

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/dotnetcli.host.json

@@ -1,6 +1,22 @@
 {
   "$schema": "https://json.schemastore.org/dotnetcli.host",
   "symbolInfo": {
+    "AiServiceProvider": {
+      "longName": "provider",
+      "shortName": "pr"
+    },
+    "VectorStore": {
+      "longName": "vector-store",
+      "shortName": "vs"
+    },
+    "UseManagedIdentity": {
+      "longName": "managed-identity",
+      "shortName": "mi"
+    },
+    "UseAspire": {
+      "longName": "aspire",
+      "shortName": "as"
+    },
     "kestrelHttpPort": {
       "isHidden": true
     },

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/ide.host.json

@@ -15,6 +15,10 @@
     {
       "id": "VectorStore",
       "isVisible": true
+    },
+    {
+      "id": "UseAspire",
+      "isVisible": true
     }
   ]
 }