Use computed symbols for all bool checks in the template. Sort usings in Program.cs.

Author: jeffhandley

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

@@ -88,7 +88,7 @@
         ]
       },
       {
-        "condition": "(!UseLocalVectorStore)",
+        "condition": "(!IsLocalVectorStore)",
         "exclude": [
           "ChatWithCustomData-CSharp.Web/Services/JsonVectorStore.cs"
         ]
@@ -185,6 +185,10 @@
       "defaultValue": "false",
       "description": "Create the project as a distributed application using Aspire."
     },
+    "IsManagedIdentity": {
+      "type": "computed",
+      "value": "(UseManagedIdentity)"
+    },
     "IsAspire": {
       "type": "computed",
       "value": "(UseAspire || VectorStore == \"qdrant\")"
@@ -209,21 +213,21 @@
       "type": "computed",
       "value": "(AiServiceProvider == \"azureaifoundry\")"
     },
-    "UseAzureAISearch": {
+    "IsAzureAISearch": {
       "type": "computed",
       "value": "(VectorStore == \"azureaisearch\")"
     },
-    "UseLocalVectorStore": {
+    "IsLocalVectorStore": {
       "type": "computed",
       "value": "(VectorStore == \"local\")"
     },
-    "UseQdrant": {
+    "IsQdrant": {
       "type": "computed",
       "value": "(VectorStore == \"qdrant\")"
     },
-    "UseAzure": {
+    "IsAzure": {
       "type": "computed",
-      "value": "(IsAzureOpenAI || IsAzureAiFoundry || UseAzureAISearch)"
+      "value": "(IsAzureOpenAI || IsAzureAIFoundry || IsAzureAISearch)"
     },
     "ChatModel": {
       "type": "parameter",

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/AppHost.cs

@@ -29,7 +29,7 @@
     modelName: "text-embedding-3-small",
     modelVersion: "1");
 #endif
-#if (UseAzureAISearch)
+#if (IsAzureAISearch)
 
 // See https://learn.microsoft.com/dotnet/aspire/azure/local-provisioning#configuration
 // for instructions providing configuration values
@@ -42,13 +42,13 @@
 var chat = ollama.AddModel("chat", "llama3.2");
 var embeddings = ollama.AddModel("embeddings", "all-minilm");
 #endif
-#if (UseAzureAISearch) // VECTOR DATABASE CONFIGURATION
-#elif (UseQdrant)
+#if (IsAzureAISearch) // VECTOR DATABASE CONFIGURATION
+#elif (IsQdrant)
 
 var vectorDB = builder.AddQdrant("vectordb")
     .WithDataVolume()
     .WithLifetime(ContainerLifetime.Persistent);
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 #endif
 
 var webApp = builder.AddProject<Projects.ChatWithCustomData_CSharp_Web_AspireClassName_Web>("aichatweb-app");
@@ -65,15 +65,15 @@
     .WithReference(openai)
     .WaitFor(openai);
 #endif
-#if (UseAzureAISearch) // VECTOR DATABASE REFERENCES
+#if (IsAzureAISearch) // VECTOR DATABASE REFERENCES
 webApp
     .WithReference(search)
     .WaitFor(search);
-#elif (UseQdrant)
+#elif (IsQdrant)
 webApp
     .WithReference(vectorDB)
     .WaitFor(vectorDB);
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 #endif
 
 builder.Build().Run();

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/ChatWithCustomData-CSharp.AppHost.csproj.in

@@ -12,9 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" Version="${TemplatePackageVersion_Aspire}" />
-<!--#if (UseQdrant)
+<!--#if (IsQdrant)
     <PackageReference Include="Aspire.Hosting.Qdrant" Version="${TemplatePackageVersion_Aspire}" />
-#elif (UseAzureAISearch)
+#elif (IsAzureAISearch)
     <PackageReference Include="Aspire.Hosting.Azure.Search" Version="${TemplatePackageVersion_Aspire}" />
 #endif -->
 <!--#if (IsAzureOpenAI) -->

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/ChatWithCustomData-CSharp.Web.csproj.in

@@ -15,7 +15,7 @@
     <PackageReference Include="OllamaSharp" Version="${TemplatePackageVersion_OllamaSharp}" />
 #elif ((IsGHModels || IsOpenAI) && !IsAspire)
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
-#elif (IsAzureAiFoundry)
+#elif (IsAzureAIFoundry)
     <PackageReference Include="Azure.AI.Projects" Version="${TemplatePackageVersion_AzureAIProjects}" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
 #endif -->
@@ -26,24 +26,24 @@
 <!--#if (IsAzureOpenAI && !IsAspire) -->
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
 <!--#endif -->
-<!--#if (UseManagedIdentity) -->
+<!--#if (IsManagedIdentity) -->
     <PackageReference Include="Azure.Identity" Version="${TemplatePackageVersion_AzureIdentity}" />
 <!--#endif -->
     <PackageReference Include="Microsoft.Extensions.AI" Version="${TemplatePackageVersion_MicrosoftExtensionsAI}" />
     <PackageReference Include="Microsoft.SemanticKernel.Core" Version="${TemplatePackageVersion_MicrosoftSemanticKernel}" />
     <PackageReference Include="PdfPig" Version="${TemplatePackageVersion_PdfPig}" />
     <PackageReference Include="System.Linq.Async" Version="${TemplatePackageVersion_SystemLinqAsync}" />
-<!--#if (UseAzureAISearch && IsAspire)
+<!--#if (IsAzureAISearch && IsAspire)
     <PackageReference Include="Aspire.Azure.Search.Documents" Version="${TemplatePackageVersion_Aspire}" />
-#elif (UseAzureAISearch && !IsAspire)
+#elif (IsAzureAISearch && !IsAspire)
     <PackageReference Include="Azure.Search.Documents" Version="${TemplatePackageVersion_AzureSearchDocuments}" />
 #endif -->
-<!--#if (UseAzureAISearch)
+<!--#if (IsAzureAISearch)
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="${TemplatePackageVersion_MicrosoftSemanticKernel_Preview}" />
-#elif (UseQdrant)-->
+#elif (IsQdrant)-->
     <PackageReference Include="Aspire.Qdrant.Client" Version="${TemplatePackageVersion_Aspire}" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="${TemplatePackageVersion_MicrosoftSemanticKernel_Preview}" />
-<!--#elif (UseLocalVectorStore)-->
+<!--#elif (IsLocalVectorStore)-->
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.SqliteVec" Version="${TemplatePackageVersion_MicrosoftSemanticKernel_Preview}" />
 <!--#endif -->
   </ItemGroup>

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs

@@ -1,12 +1,10 @@
 using Microsoft.Extensions.AI;
+#if (IsOpenAI || IsGHModels)
+using OpenAI;
+#endif
 using ChatWithCustomData_CSharp.Web.Components;
 using ChatWithCustomData_CSharp.Web.Services;
 using ChatWithCustomData_CSharp.Web.Services.Ingestion;
-#if (IsOllama)
-#elif (IsOpenAI || IsGHModels)
-using OpenAI;
-#else // IsAzureOpenAI
-#endif
 
 var builder = WebApplication.CreateBuilder(args);
 builder.AddServiceDefaults();
@@ -20,7 +18,7 @@
         c.EnableSensitiveData = builder.Environment.IsDevelopment());
 builder.AddOllamaApiClient("embeddings")
     .AddEmbeddingGenerator();
-#elif (IsAzureAiFoundry)
+#elif (IsAzureAIFoundry)
 #else // (IsOpenAI || IsAzureOpenAI || IsGHModels)
 #if (IsOpenAI)
 var openai = builder.AddOpenAIClient("openai");
@@ -34,15 +32,15 @@
 openai.AddEmbeddingGenerator("text-embedding-3-small");
 #endif
 
-#if (UseAzureAISearch)
+#if (IsAzureAISearch)
 builder.AddAzureSearchClient("search");
 builder.Services.AddAzureAISearchCollection<IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks");
 builder.Services.AddAzureAISearchCollection<IngestedDocument>("data-ChatWithCustomData-CSharp.Web-documents");
-#elif (UseQdrant)
+#elif (IsQdrant)
 builder.AddQdrantClient("vectordb");
 builder.Services.AddQdrantCollection<Guid, IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks");
 builder.Services.AddQdrantCollection<Guid, IngestedDocument>("data-ChatWithCustomData-CSharp.Web-documents");
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 var vectorStorePath = Path.Combine(AppContext.BaseDirectory, "vector-store.db");
 var vectorStoreConnectionString = $"Data Source={vectorStorePath}";
 builder.Services.AddSqliteCollection<string, IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks", vectorStoreConnectionString);

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.cs

@@ -1,23 +1,21 @@
-using Microsoft.Extensions.AI;
-using ChatWithCustomData_CSharp.Web.Components;
-using ChatWithCustomData_CSharp.Web.Services;
-using ChatWithCustomData_CSharp.Web.Services.Ingestion;
-#if(IsAzureOpenAI || UseAzureAISearch)
+#if (!IsOllama)
+using System.ClientModel;
+#endif
+#if (IsAzureAISearch && !IsManagedIdentity)
 using Azure;
-#if (UseManagedIdentity)
+#elif (IsManagedIdentity)
+using Azure.Core;
 using Azure.Identity;
 #endif
-#endif
+using Microsoft.Extensions.AI;
 #if (IsOllama)
 using OllamaSharp;
 #else
 using OpenAI;
-using System.ClientModel;
-#if (UseManagedIdentity && IsAzureOpenAI)
-using Azure.Core;
-using Azure.Identity;
-#endif
 #endif
+using ChatWithCustomData_CSharp.Web.Components;
+using ChatWithCustomData_CSharp.Web.Services;
+using ChatWithCustomData_CSharp.Web.Services.Ingestion;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddRazorComponents().AddInteractiveServerComponents();
@@ -52,18 +50,18 @@
 var chatClient = openAIClient.GetOpenAIResponseClient("gpt-4o-mini").AsIChatClient();
 #pragma warning restore OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 var embeddingGenerator = openAIClient.GetEmbeddingClient("text-embedding-3-small").AsIEmbeddingGenerator();
-#elif (IsAzureAiFoundry)
+#elif (IsAzureAIFoundry)
 
 #else // IsAzureOpenAI
 // You will need to set the endpoint and key to your own values
 // You can do this using Visual Studio's "Manage User Secrets" UI, or on the command line:
 //   cd this-project-directory
 //   dotnet user-secrets set AzureOpenAI:Endpoint https://YOUR-DEPLOYMENT-NAME.openai.azure.com
-#if (!UseManagedIdentity)
+#if (!IsManagedIdentity)
 //   dotnet user-secrets set AzureOpenAI:Key YOUR-API-KEY
 #endif
 var azureOpenAIEndpoint = new Uri(new Uri(builder.Configuration["AzureOpenAI:Endpoint"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Endpoint. See the README for details.")), "/openai/v1");
-#if (UseManagedIdentity)
+#if (IsManagedIdentity)
 var tokenCredential = new DefaultAzureCredential();
 var token = tokenCredential.GetToken(new TokenRequestContext(["https://cognitiveservices.azure.com/.default"]), default);
 var openAIOptions = new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint };
@@ -78,25 +76,25 @@
 var embeddingGenerator = azureOpenAi.GetEmbeddingClient("text-embedding-3-small").AsIEmbeddingGenerator();
 #endif
 
-#if (UseAzureAISearch)
+#if (IsAzureAISearch)
 // You will need to set the endpoint and key to your own values
 // You can do this using Visual Studio's "Manage User Secrets" UI, or on the command line:
 //   cd this-project-directory
 //   dotnet user-secrets set AzureAISearch:Endpoint https://YOUR-DEPLOYMENT-NAME.search.windows.net
-#if (!UseManagedIdentity)
+#if (!IsManagedIdentity)
 //   dotnet user-secrets set AzureAISearch:Key YOUR-API-KEY
 #endif
 var azureAISearchEndpoint = new Uri(builder.Configuration["AzureAISearch:Endpoint"]
     ?? throw new InvalidOperationException("Missing configuration: AzureAISearch:Endpoint. See the README for details."));
-#if (UseManagedIdentity)
+#if (IsManagedIdentity)
 var azureAISearchCredential = new DefaultAzureCredential();
 #else
 var azureAISearchCredential = new AzureKeyCredential(builder.Configuration["AzureAISearch:Key"]
     ?? throw new InvalidOperationException("Missing configuration: AzureAISearch:Key. See the README for details."));
 #endif
 builder.Services.AddAzureAISearchCollection<IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks", azureAISearchEndpoint, azureAISearchCredential);
 builder.Services.AddAzureAISearchCollection<IngestedDocument>("data-ChatWithCustomData-CSharp.Web-documents", azureAISearchEndpoint, azureAISearchCredential);
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 var vectorStorePath = Path.Combine(AppContext.BaseDirectory, "vector-store.db");
 var vectorStoreConnectionString = $"Data Source={vectorStorePath}";
 builder.Services.AddSqliteCollection<string, IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks", vectorStoreConnectionString);

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/README.md

@@ -5,7 +5,7 @@ This project is an AI chat application that demonstrates how to chat with custom
 >[!NOTE]
 > Before running this project you need to configure the API keys or endpoints for the providers you have chosen. See below for details specific to your choices.
 
-#### ---#if (UseAzure)
+#### ---#if (IsAzure)
 ### Prerequisites
 To use Azure OpenAI or Azure AI Search, you need an Azure account. If you don't already have one, [create an Azure account](https://azure.microsoft.com/free/).
 
@@ -104,7 +104,7 @@ To use Azure OpenAI, you will need an Azure account and an Azure OpenAI Service
 ### 2. Deploy the Models
 Deploy the `gpt-4o-mini` and `text-embedding-3-small` models to your Azure OpenAI Service resource. When creating those deployments, give them the same names as the models (`gpt-4o-mini` and `text-embedding-3-small`). See the Azure OpenAI documentation to learn how to [Deploy a model](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#deploy-a-model).
 
-#### ---#if (UseManagedIdentity)
+#### ---#if (IsManagedIdentity)
 ### 3. Configure Azure OpenAI for Keyless Authentication
 This template is configured to use keyless authentication (also known as Managed Identity, with Entra ID). In the Azure Portal, when viewing the Azure OpenAI resource you just created, view access control settings and assign yourself the `Azure AI Developer` role. [Learn more about configuring authentication for local development](https://learn.microsoft.com/azure/developer/ai/keyless-connections?tabs=csharp%2Cazure-cli#authenticate-for-local-development).
 
@@ -160,7 +160,7 @@ Make sure to replace `YOUR-AZURE-OPENAI-KEY` and `YOUR-AZURE-OPENAI-ENDPOINT` wi
 
 #### ---#endif
 #### ---#endif
-#### ---#if (UseAzureAISearch)
+#### ---#if (IsAzureAISearch)
 ## Configure Azure AI Search
 
 To use Azure AI Search, you will need an Azure account and an Azure AI Search resource. For detailed instructions, see the [Azure AI Search documentation](https://learn.microsoft.com/azure/search/search-create-service-portal).
@@ -170,7 +170,7 @@ Follow the instructions in the [Azure portal](https://portal.azure.com/) to crea
 
 Note that if you previously used the same Azure AI Search resource with different model using this project name, you may need to delete your `data-ChatWithCustomData-CSharp.Web-chunks` and `data-ChatWithCustomData-CSharp.Web-documents` indexes using the [Azure portal](https://portal.azure.com/) first before continuing; otherwise, data ingestion may fail due to a vector dimension mismatch.
 
-#### ---#if (UseManagedIdentity)
+#### ---#if (IsManagedIdentity)
 ### 2. Configure Azure AI Search for Keyless Authentication
 This template is configured to use keyless authentication (also known as Managed Identity, with Entra ID). Before continuing, you'll need to configure your Azure AI Search resource to support this. [Learn more](https://learn.microsoft.com/azure/search/keyless-connections).  After creation, ensure that you have selected Role-Based Access Control (RBAC) under Settings > Keys, as this is not the default. Assign yourself the roles called out for local development. [Learn more](https://learn.microsoft.com/azure/search/keyless-connections#roles-for-local-development).
 

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/IngestedChunk.cs

@@ -9,14 +9,14 @@ public class IngestedChunk
 #else
     private const int VectorDimensions = 1536; // 1536 is the default vector size for the OpenAI text-embedding-3-small model
 #endif
-#if (UseAzureAISearch || UseQdrant)
+#if (IsAzureAISearch || IsQdrant)
     private const string VectorDistanceFunction = DistanceFunction.CosineSimilarity;
 #else
     private const string VectorDistanceFunction = DistanceFunction.CosineDistance;
 #endif
 
     [VectorStoreKey]
-#if (UseQdrant)
+#if (IsQdrant)
     public required Guid Key { get; set; }
 #else
     public required string Key { get; set; }

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/IngestedDocument.cs

@@ -5,14 +5,14 @@ namespace ChatWithCustomData_CSharp.Web.Services;
 public class IngestedDocument
 {
     private const int VectorDimensions = 2;
-#if (UseAzureAISearch || UseQdrant)
+#if (IsAzureAISearch || IsQdrant)
     private const string VectorDistanceFunction = DistanceFunction.CosineSimilarity;
 #else
     private const string VectorDistanceFunction = DistanceFunction.CosineDistance;
 #endif
 
     [VectorStoreKey]
-#if (UseQdrant)
+#if (IsQdrant)
     public required Guid Key { get; set; }
 #else
     public required string Key { get; set; }

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DataIngestor.cs

@@ -5,7 +5,7 @@ namespace ChatWithCustomData_CSharp.Web.Services.Ingestion;
 
 public class DataIngestor(
     ILogger<DataIngestor> logger,
-#if (UseQdrant)
+#if (IsQdrant)
     VectorStoreCollection<Guid, IngestedChunk> chunksCollection,
     VectorStoreCollection<Guid, IngestedDocument> documentsCollection)
 #else