@code {
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatHeader.razor.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatHeader.razor.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatHeader.razor.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatHeader.razor.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatInput.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatInput.razor
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatInput.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatInput.razor
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatInput.razor.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatInput.razor.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatInput.razor.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatInput.razor.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatInput.razor.js b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatInput.razor.js
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatInput.razor.js
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatInput.razor.js
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageItem.razor.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.js b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.js
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.js
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatMessageList.razor.js
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Chat/ChatSuggestions.razor.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Error.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Error.razor
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Pages/Error.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Pages/Error.razor
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Routes.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Routes.razor
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/Routes.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/Routes.razor
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/_Imports.razor b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/_Imports.razor
similarity index 66%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/_Imports.razor
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/_Imports.razor
index 9ad55554648..7464a453aee 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Components/_Imports.razor
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Components/_Imports.razor
@@ -7,7 +7,7 @@
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.Extensions.AI
@using Microsoft.JSInterop
-@using ChatWithCustomData_CSharp.Web
-@using ChatWithCustomData_CSharp.Web.Components
-@using ChatWithCustomData_CSharp.Web.Components.Layout
-@using ChatWithCustomData_CSharp.Web.Services
+@using AIChatWeb_CSharp.Web
+@using AIChatWeb_CSharp.Web.Components
+@using AIChatWeb_CSharp.Web.Components.Layout
+@using AIChatWeb_CSharp.Web.Services
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/OllamaResilienceHandlerExtensions.cs
similarity index 95%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/OllamaResilienceHandlerExtensions.cs
index fed9c91ca93..4454d8a5577 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/OllamaResilienceHandlerExtensions.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/OllamaResilienceHandlerExtensions.cs
@@ -1,7 +1,7 @@
using System;
using Microsoft.Extensions.DependencyInjection;
-namespace ChatWithCustomData_CSharp.Web.Services;
+namespace AIChatWeb_CSharp.Web.Services;
public static class OllamaResilienceHandlerExtensions
{
@@ -31,4 +31,3 @@ public static IServiceCollection AddOllamaResilienceHandler(this IServiceCollect
return services;
}
}
-
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Program.Aspire.cs
similarity index 94%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Program.Aspire.cs
index 898b61efc53..31442718f1f 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Program.Aspire.cs
@@ -2,9 +2,9 @@
#if (IsOpenAI || IsGHModels)
using OpenAI;
#endif
-using ChatWithCustomData_CSharp.Web.Components;
-using ChatWithCustomData_CSharp.Web.Services;
-using ChatWithCustomData_CSharp.Web.Services.Ingestion;
+using AIChatWeb_CSharp.Web.Components;
+using AIChatWeb_CSharp.Web.Services;
+using AIChatWeb_CSharp.Web.Services.Ingestion;
var builder = WebApplication.CreateBuilder(args);
builder.AddServiceDefaults();
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Program.cs
similarity index 97%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Program.cs
index a51a674cf71..4b041f4a15f 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Program.cs
@@ -14,9 +14,9 @@
#elif (IsGHModels || IsOpenAI || IsAzureOpenAI)
using OpenAI;
#endif
-using ChatWithCustomData_CSharp.Web.Components;
-using ChatWithCustomData_CSharp.Web.Services;
-using ChatWithCustomData_CSharp.Web.Services.Ingestion;
+using AIChatWeb_CSharp.Web.Components;
+using AIChatWeb_CSharp.Web.Services;
+using AIChatWeb_CSharp.Web.Services.Ingestion;
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddRazorComponents().AddInteractiveServerComponents();
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Properties/launchSettings.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Properties/launchSettings.json
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Properties/launchSettings.json
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Properties/launchSettings.json
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/README.md
similarity index 98%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/README.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/README.md
index 88dff74d315..14677ca5372 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/README.md
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/README.md
@@ -168,7 +168,7 @@ To use Azure AI Search, you will need an Azure account and an Azure AI Search re
### 1. Create an Azure AI Search Resource
Follow the instructions in the [Azure portal](https://portal.azure.com/) to create an Azure AI Search resource. Note that there is a free tier for the service but it is not currently the default setting on the portal.
-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.
+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-AIChatWeb-CSharp.Web-chunks` and `data-AIChatWeb-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 (IsManagedIdentity)
### 2. Configure Azure AI Search for Keyless Authentication
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/IngestedChunk.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/IngestedChunk.cs
similarity index 90%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/IngestedChunk.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/IngestedChunk.cs
index 9316ee1dcfb..60e6b5684e4 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/IngestedChunk.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/IngestedChunk.cs
@@ -1,7 +1,7 @@
using System.Text.Json.Serialization;
using Microsoft.Extensions.VectorData;
-namespace ChatWithCustomData_CSharp.Web.Services;
+namespace AIChatWeb_CSharp.Web.Services;
public class IngestedChunk
{
@@ -15,7 +15,7 @@ public class IngestedChunk
#else
public const string VectorDistanceFunction = DistanceFunction.CosineDistance;
#endif
- public const string CollectionName = "data-ChatWithCustomData-CSharp.Web-chunks";
+ public const string CollectionName = "data-AIChatWeb-CSharp.Web-chunks";
[VectorStoreKey(StorageName = "key")]
[JsonPropertyName("key")]
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DataIngestor.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/DataIngestor.cs
similarity index 95%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DataIngestor.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/DataIngestor.cs
index af23c29f13c..c573403e618 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DataIngestor.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/DataIngestor.cs
@@ -4,7 +4,7 @@
using Microsoft.Extensions.VectorData;
using Microsoft.ML.Tokenizers;
-namespace ChatWithCustomData_CSharp.Web.Services.Ingestion;
+namespace AIChatWeb_CSharp.Web.Services.Ingestion;
public class DataIngestor(
ILogger logger,
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DocumentReader.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/DocumentReader.cs
similarity index 96%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DocumentReader.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/DocumentReader.cs
index 5122cde3e9a..0a27e628326 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/DocumentReader.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/DocumentReader.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.DataIngestion;
-namespace ChatWithCustomData_CSharp.Web.Services.Ingestion;
+namespace AIChatWeb_CSharp.Web.Services.Ingestion;
internal sealed class DocumentReader(DirectoryInfo rootDirectory) : IngestionDocumentReader
{
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/PdfPigReader.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/PdfPigReader.cs
similarity index 95%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/PdfPigReader.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/PdfPigReader.cs
index 2e1ef18494d..ab8d61ac558 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/Ingestion/PdfPigReader.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/Ingestion/PdfPigReader.cs
@@ -4,7 +4,7 @@
using UglyToad.PdfPig.DocumentLayoutAnalysis.PageSegmenter;
using UglyToad.PdfPig.DocumentLayoutAnalysis.WordExtractor;
-namespace ChatWithCustomData_CSharp.Web.Services.Ingestion;
+namespace AIChatWeb_CSharp.Web.Services.Ingestion;
internal sealed class PdfPigReader : IngestionDocumentReader
{
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/SemanticSearch.cs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/SemanticSearch.cs
similarity index 90%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/SemanticSearch.cs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/SemanticSearch.cs
index fb0c2eccef0..49bef8de3d1 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Services/SemanticSearch.cs
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/Services/SemanticSearch.cs
@@ -1,7 +1,7 @@
-using ChatWithCustomData_CSharp.Web.Services.Ingestion;
+using AIChatWeb_CSharp.Web.Services.Ingestion;
using Microsoft.Extensions.VectorData;
-namespace ChatWithCustomData_CSharp.Web.Services;
+namespace AIChatWeb_CSharp.Web.Services;
public class SemanticSearch(
#if (IsQdrant)
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/appsettings.Development.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/appsettings.Development.json
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/appsettings.Development.json
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/appsettings.Development.json
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/appsettings.json b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/appsettings.json
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/appsettings.json
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/appsettings.json
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/Data/Example_GPS_Watch.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/Data/Example_GPS_Watch.md
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/Data/Example_GPS_Watch.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/Data/Example_GPS_Watch.md
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/app.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/app.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/app.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/app.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/app.js b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/app.js
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/app.js
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/app.js
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/favicon.ico b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/favicon.ico
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/favicon.ico
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/favicon.ico
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/dompurify/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/dompurify/README.md
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/dompurify/README.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/dompurify/README.md
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/dompurify/dist/purify.es.mjs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/dompurify/dist/purify.es.mjs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/dompurify/dist/purify.es.mjs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/dompurify/dist/purify.es.mjs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.html b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.html
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.html
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.html
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.mjs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.mjs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.mjs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/markdown_viewer/viewer.mjs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/marked/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/marked/README.md
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/marked/README.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/marked/README.md
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/marked/dist/marked.esm.js b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/marked/dist/marked.esm.js
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/marked/dist/marked.esm.js
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/marked/dist/marked.esm.js
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.html b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.html
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.html
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.html
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.mjs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.mjs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.mjs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdf_viewer/viewer.mjs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/README.md
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/README.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/README.md
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.min.mjs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.min.mjs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.min.mjs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.min.mjs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.worker.min.mjs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.worker.min.mjs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.worker.min.mjs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/build/pdf.worker.min.mjs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/images/loading-icon.gif b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/images/loading-icon.gif
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/images/loading-icon.gif
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/images/loading-icon.gif
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.mjs b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.mjs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.mjs
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/pdfjs-dist/dist/web/pdf_viewer.mjs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/tailwindcss/README.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/tailwindcss/README.md
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/tailwindcss/README.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/tailwindcss/README.md
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/tailwindcss/dist/preflight.css b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/tailwindcss/dist/preflight.css
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/wwwroot/lib/tailwindcss/dist/preflight.css
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.Web/wwwroot/lib/tailwindcss/dist/preflight.css
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.sln.in b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.sln
similarity index 70%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.sln.in
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.sln
index aa1c261a2a3..0959f5ab945 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.sln.in
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/AIChatWeb-CSharp.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatWithCustomData-CSharp.AppHost", "ChatWithCustomData-CSharp.AppHost\ChatWithCustomData-CSharp.AppHost.csproj", "{4DF52F58-4890-4A0A-BC25-5C3D167B3490}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIChatWeb-CSharp.AppHost", "AIChatWeb-CSharp.AppHost\AIChatWeb-CSharp.AppHost.csproj", "{4DF52F58-4890-4A0A-BC25-5C3D167B3490}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatWithCustomData-CSharp.ServiceDefaults", "ChatWithCustomData-CSharp.ServiceDefaults\ChatWithCustomData-CSharp.ServiceDefaults.csproj", "{2222CF31-6E3A-42E7-AD3A-A56B14EAD9D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIChatWeb-CSharp.ServiceDefaults", "AIChatWeb-CSharp.ServiceDefaults\AIChatWeb-CSharp.ServiceDefaults.csproj", "{2222CF31-6E3A-42E7-AD3A-A56B14EAD9D0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatWithCustomData-CSharp.Web", "ChatWithCustomData-CSharp.Web\ChatWithCustomData-CSharp.Web.csproj", "{A7D19173-F0AD-4A8D-B8EA-E12DE203E409}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIChatWeb-CSharp.Web", "AIChatWeb-CSharp.Web\AIChatWeb-CSharp.Web.csproj", "{A7D19173-F0AD-4A8D-B8EA-E12DE203E409}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/README.Aspire.md b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/README.Aspire.md
similarity index 91%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/README.Aspire.md
rename to src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/README.Aspire.md
index f30fcbfcf2e..0fff810489c 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/README.Aspire.md
+++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/templates/AIChatWeb-CSharp/README.Aspire.md
@@ -27,7 +27,7 @@ To use models hosted by GitHub Models, you will need to create a GitHub personal
#### ---#if (hostIdentifier == "vs")
Configure your token for this project using .NET User Secrets:
-1. In Visual Studio, right-click on the ChatWithCustomData-CSharp.AppHost project in the Solution Explorer and select "Manage User Secrets".
+1. In Visual Studio, right-click on the AIChatWeb-CSharp.AppHost project in the Solution Explorer and select "Manage User Secrets".
2. This opens a `secrets.json` file where you can store your API keys without them being tracked in source control. Add the following key and value:
```json
@@ -39,7 +39,7 @@ Configure your token for this project using .NET User Secrets:
From the command line, configure your token for this project using .NET User Secrets by running the following commands:
```sh
-cd ChatWithCustomData-CSharp.AppHost
+cd AIChatWeb-CSharp.AppHost
dotnet user-secrets set ConnectionStrings:openai "Endpoint=https://models.inference.ai.azure.com;Key=YOUR-API-KEY"
```
#### ---#endif
@@ -54,7 +54,7 @@ To call the OpenAI REST API, you will need an API key. To obtain one, first [cre
#### ---#if (hostIdentifier == "vs")
Configure your API key for this project, using .NET User Secrets:
-1. In Visual Studio, right-click on the ChatWithCustomData-CSharp.AppHost project in the Solution Explorer and select "Manage User Secrets".
+1. In Visual Studio, right-click on the AIChatWeb-CSharp.AppHost project in the Solution Explorer and select "Manage User Secrets".
2. This will open a secrets.json file where you can store your API key without them being tracked in source control. Add the following key and value to the file:
```json
@@ -67,7 +67,7 @@ Configure your API key for this project, using .NET User Secrets:
From the command line, configure your API key for this project using .NET User Secrets by running the following commands:
```sh
-cd ChatWithCustomData-CSharp.AppHost
+cd AIChatWeb-CSharp.AppHost
dotnet user-secrets set ConnectionStrings:openai "Key=YOUR-API-KEY"
```
#### ---#endif
@@ -108,7 +108,7 @@ Note: Qdrant and Docker are excellent open source products, but are not maintain
1. Open the project folder in Visual Studio Code.
2. Install the [C# Dev Kit extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit) for Visual Studio Code.
-3. Once installed, Open the `Program.cs` file in the ChatWithCustomData-CSharp.AppHost project.
+3. Once installed, Open the `Program.cs` file in the AIChatWeb-CSharp.AppHost project.
4. Run the project by clicking the "Run" button in the Debug view.
## Trust the localhost certificate
@@ -119,7 +119,7 @@ See [Troubleshoot untrusted localhost certificate in Aspire](https://learn.micro
# Updating JavaScript dependencies
-This template leverages JavaScript libraries to provide essential functionality. These libraries are located in the wwwroot/lib folder of the ChatWithCustomData-CSharp.Web project. For instructions on updating each dependency, please refer to the README.md file in each respective folder.
+This template leverages JavaScript libraries to provide essential functionality. These libraries are located in the wwwroot/lib folder of the AIChatWeb-CSharp.Web project. For instructions on updating each dependency, please refer to the README.md file in each respective folder.
# Learn More
To learn more about development with .NET and AI, check out the following links:
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/Microsoft.McpServer.ProjectTemplates.csproj b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/Microsoft.McpServer.ProjectTemplates.csproj
new file mode 100644
index 00000000000..d13bce3c597
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/Microsoft.McpServer.ProjectTemplates.csproj
@@ -0,0 +1,47 @@
+
+
+
+ Template
+ netstandard2.0
+ MCP Server project templates.
+ dotnet-new;templates;ai
+
+ preview
+
+
+ 0
+ 5
+ 0
+ preview
+ 1
+
+ AI
+ 0
+ 0
+
+ true
+ false
+ true
+ false
+ false
+ content
+ false
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/README.md b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/README.md
new file mode 100644
index 00000000000..c8d71cb61fd
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/README.md
@@ -0,0 +1,3 @@
+# Microsoft.McpServer.ProjectTemplates
+
+Provides MCP Server Project Templates.
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/dotnetcli.host.json
similarity index 66%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/dotnetcli.host.json
index 64694e46660..c2105a0018c 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/dotnetcli.host.json
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/dotnetcli.host.json
@@ -1,13 +1,9 @@
{
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
- "TargetFrameworkOverride": {
- "isHidden": "true",
- "longName": "target-framework-override",
- "shortName": ""
- },
- "Framework": {
- "longName": "framework"
+ "Transport": {
+ "longName": "transport",
+ "shortName": "t"
},
"NativeAot": {
"longName": "aot",
@@ -16,6 +12,15 @@
"SelfContained": {
"longName": "self-contained",
"shortName": ""
+ },
+ "Framework": {
+ "longName": "framework"
+ },
+ "httpPort": {
+ "isHidden": true
+ },
+ "httpsPort": {
+ "isHidden": true
}
},
"usageExamples": [
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/ide.host.json
similarity index 79%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/ide.host.json
index 8574a4767a5..a4971fdf7fc 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide.host.json
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/ide.host.json
@@ -3,6 +3,10 @@
"order": 0,
"icon": "ide/icon.ico",
"symbolInfo": [
+ {
+ "id": "Transport",
+ "isVisible": true
+ },
{
"id": "NativeAot",
"isVisible": true
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide/icon.ico b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/ide/icon.ico
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.template.config/ide/icon.ico
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/ide/icon.ico
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/template.json b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/template.json
new file mode 100644
index 00000000000..74ea40a826e
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/.template.config/template.json
@@ -0,0 +1,210 @@
+{
+ "$schema": "http://json.schemastore.org/template",
+ "author": "Microsoft",
+ "classifications": [
+ "Common",
+ "AI",
+ "MCP"
+ ],
+ "identity": "Microsoft.McpServer.ProjectTemplates.McpServer.CSharp",
+ "name": "MCP Server App",
+ "description": "A project template for creating a Model Context Protocol (MCP) server using C# and the ModelContextProtocol package.",
+ "shortName": "mcpserver",
+ "defaultName": "McpServer",
+ "sourceName": "McpServer-CSharp",
+ "preferNameDirectory": true,
+ "tags": {
+ "language": "C#",
+ "type": "project"
+ },
+ "guids": [
+ "aaaaaaaa-bbbb-cccc-dddd-eeeeeeffffff"
+ ],
+ "symbols": {
+ "hostIdentifier": {
+ "type": "bind",
+ "binding": "HostIdentifier"
+ },
+ "Transport": {
+ "type": "parameter",
+ "displayName": "The MCP server _transport type to use",
+ "description": "Whether to create a 'local' (stdio transport) or 'remote' (http transport) MCP server",
+ "datatype": "choice",
+ "choices": [
+ {
+ "choice": "local",
+ "description": "A console application will be created to use the stdio transport as a local MCP server"
+ },
+ {
+ "choice": "remote",
+ "description": "An ASP.NET Core web application will be created to use the http transport as a remote MCP server"
+ }
+ ],
+ "defaultValue": "local"
+ },
+ "NativeAot": {
+ "type": "parameter",
+ "datatype": "bool",
+ "defaultValue": "false",
+ "displayName": "Enable _native AOT publish",
+ "description": "Whether to enable the MCP server for publishing as a native AOT application."
+ },
+ "SelfContained": {
+ "type": "parameter",
+ "datatype": "bool",
+ "defaultValue": "true",
+ "displayName": "Enable _self-contained publish",
+ "description": "Whether to enable the MCP server for publishing as a self-contained application."
+ },
+ "Framework": {
+ "type": "parameter",
+ "description": "The target framework for the project.",
+ "displayName": "Framework",
+ "datatype": "choice",
+ "choices": [
+ {
+ "choice": "net10.0",
+ "description": ".NET 10"
+ },
+ {
+ "choice": "net9.0",
+ "description": ".NET 9"
+ },
+ {
+ "choice": "net8.0",
+ "description": ".NET 8"
+ }
+ ],
+ "replaces": "net10.0",
+ "defaultValue": "net10.0"
+ },
+ "httpsPort": {
+ "type": "parameter",
+ "datatype": "integer",
+ "description": "Port number to use for the HTTPS endpoint in launchSettings.json."
+ },
+ "httpsPortGenerated": {
+ "type": "generated",
+ "generator": "port",
+ "parameters": {
+ "low": 5000,
+ "high": 5300
+ }
+ },
+ "httpsPortReplacer": {
+ "type": "generated",
+ "generator": "coalesce",
+ "parameters": {
+ "sourceVariableName": "httpsPort",
+ "fallbackVariableName": "httpsPortGenerated"
+ },
+ "replaces": "9995",
+ "onlyIf": [{
+ "after": "localhost:"
+ }]
+ },
+ "httpPort": {
+ "type": "parameter",
+ "datatype": "integer",
+ "description": "Port number to use for the HTTP endpoint in launchSettings.json."
+ },
+ "httpPortGenerated": {
+ "type": "generated",
+ "generator": "port",
+ "parameters": {
+ "low": 6000,
+ "high": 6300
+ }
+ },
+ "httpPortReplacer": {
+ "type": "generated",
+ "generator": "coalesce",
+ "parameters": {
+ "sourceVariableName": "httpPort",
+ "fallbackVariableName": "httpPortGenerated"
+ },
+ "replaces": "9996",
+ "onlyIf": [{
+ "after": "localhost:"
+ }]
+ },
+ "IsTransportRemote": {
+ "type": "computed",
+ "value": "(Transport == \"remote\")"
+ },
+ "IsTransportLocal": {
+ "type": "computed",
+ "value": "(!IsTransportRemote)"
+ }
+ },
+ "primaryOutputs": [
+ {
+ "path": "./README.md"
+ },
+ {
+ "path": "./McpServer-CSharp.csproj"
+ }
+ ],
+ "sources": [
+ {
+ "source": "./common",
+ "target": "./"
+ },
+ {
+ "condition": "(IsTransportLocal)",
+ "source": "./local",
+ "target": "./"
+ },
+ {
+ "condition": "(IsTransportRemote)",
+ "source": "./remote",
+ "target": "./"
+ }
+ ],
+ "postActions": [
+ {
+ "condition": "(hostIdentifier != \"dotnetcli\" && hostIdentifier != \"dotnetcli-preview\")",
+ "description": "Opens README file in the editor",
+ "manualInstructions": [],
+ "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6",
+ "args": {
+ "files": "0"
+ },
+ "continueOnError": true
+ }
+ ],
+ "SpecialCustomOperations": {
+ "**/*.md": {
+ "operations": [
+ {
+ "type": "conditional",
+ "configuration": {
+ "if": [ "#### ---#if" ],
+ "else": [ "#### ---#else" ],
+ "elseif": [ "#### ---#elseif", "#### ---#elif" ],
+ "endif": [ "#### ---#endif" ],
+ "trim": "true",
+ "wholeLine": "true",
+ "evaluator": "C++"
+ }
+ }
+ ]
+ },
+ "**/*.http": {
+ "operations": [
+ {
+ "type": "conditional",
+ "configuration": {
+ "if": [ "#if" ],
+ "else": [ "#else" ],
+ "elseif": [ "#elseif", "#elif" ],
+ "endif": [ "#endif" ],
+ "trim": "true",
+ "wholeLine": "true",
+ "evaluator": "C++"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/common/Tools/RandomNumberTools.cs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Tools/RandomNumberTools.cs
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/common/Tools/RandomNumberTools.cs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.mcp/server.json b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/.mcp/server.json
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/.mcp/server.json
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/.mcp/server.json
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/McpServer-CSharp.csproj-in
similarity index 85%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/McpServer-CSharp.csproj-in
index 799d5845c32..6105d4d53a9 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/McpServer-CSharp.csproj.in
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/McpServer-CSharp.csproj-in
@@ -1,8 +1,7 @@
- net10.0
- TargetFrameworkOverride
+ net10.0win-x64;win-arm64;osx-arm64;linux-x64;linux-arm64;linux-musl-x64
@@ -46,8 +45,8 @@
-
-
+
+
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Program.cs b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/Program.cs
similarity index 100%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/Program.cs
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/Program.cs
diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/README.md
similarity index 98%
rename from src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
rename to src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/README.md
index 95612c5e35e..85da5d0e61f 100644
--- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/McpServer/McpServer-CSharp/README.md
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/local/README.md
@@ -56,6 +56,11 @@ To test this MCP server from source code (locally) without using a built MCP ser
}
```
+Refer to the VS Code or Visual Studio documentation for more information on configuring and using MCP servers:
+
+- [Use MCP servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers)
+- [Use MCP servers in Visual Studio (Preview)](https://learn.microsoft.com/visualstudio/ide/mcp-servers)
+
## Testing the MCP Server
Once configured, you can ask Copilot Chat for a random number, for example, `Give me 3 random numbers`. It should prompt you to use the `get_random_number` tool on the `McpServer-CSharp` MCP server and show you the results.
@@ -98,8 +103,4 @@ For both VS Code and Visual Studio, the configuration file uses the following se
- [Official Documentation](https://modelcontextprotocol.io/)
- [Protocol Specification](https://spec.modelcontextprotocol.io/)
- [GitHub Organization](https://github.com/modelcontextprotocol)
-
-Refer to the VS Code or Visual Studio documentation for more information on configuring and using MCP servers:
-
-- [Use MCP servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers)
-- [Use MCP servers in Visual Studio (Preview)](https://learn.microsoft.com/visualstudio/ide/mcp-servers)
+- [MCP C# SDK](https://modelcontextprotocol.github.io/csharp-sdk)
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/McpServer-CSharp.csproj-in b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/McpServer-CSharp.csproj-in
new file mode 100644
index 00000000000..dfeea98e66b
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/McpServer-CSharp.csproj-in
@@ -0,0 +1,35 @@
+
+
+
+ net10.0
+
+ win-x64;win-arm64;osx-arm64;linux-x64;linux-arm64;linux-musl-x64
+
+ Major
+
+ enable
+ enable
+ aaaaaaaa-bbbb-cccc-dddd-eeeeeeffffff
+
+
+
+
+ true
+ true
+
+
+ true
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/McpServer-CSharp.http b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/McpServer-CSharp.http
new file mode 100644
index 00000000000..f79d8ec1429
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/McpServer-CSharp.http
@@ -0,0 +1,21 @@
+# For more info on HTTP files go to https://aka.ms/vs/httpfile
+
+#if (hostIdentifier == "vs")
+@HostAddress = https://localhost:9995
+#else
+@HostAddress = http://localhost:9996
+#endif
+
+POST {{HostAddress}}/
+Accept: application/json, text/event-stream
+Content-Type: application/json
+MCP-Protocol-Version: 2025-11-25
+
+{
+ "jsonrpc": "2.0",
+ "id": 1,
+ "method": "tools/call",
+ "params": {
+ "name": "get_random_number"
+ }
+}
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/Program.cs b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/Program.cs
new file mode 100644
index 00000000000..3a3ce231e69
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/Program.cs
@@ -0,0 +1,15 @@
+var builder = WebApplication.CreateBuilder(args);
+
+// Add the MCP services: the transport to use (http) and the tools to register.
+builder.Services
+ .AddMcpServer()
+ .WithHttpTransport()
+ .WithTools();
+
+var app = builder.Build();
+app.MapMcp();
+#if (hostIdentifier == "vs")
+app.UseHttpsRedirection();
+#endif
+
+app.Run();
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/Properties/launchSettings.json b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/Properties/launchSettings.json
new file mode 100644
index 00000000000..37d5661e4de
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+ "$schema": "https://json.schemastore.org/launchsettings.json",
+ "profiles": {
+ "http": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": false,
+ "applicationUrl": "http://localhost:9996",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "https": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": false,
+ "applicationUrl": "https://localhost:9995;http://localhost:9996",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ }
+ }
+}
diff --git a/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/README.md b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/README.md
new file mode 100644
index 00000000000..a8700767510
--- /dev/null
+++ b/src/ProjectTemplates/Microsoft.McpServer.ProjectTemplates/templates/McpServer-CSharp/remote/README.md
@@ -0,0 +1,78 @@
+# MCP Server
+
+This README was created using the C# MCP server project template.
+It demonstrates how you can easily create an MCP server using C# and run it as an ASP.NET Core web application.
+
+#### ---#if (SelfContained)
+The MCP server is built as a self-contained application and does not require the .NET runtime to be installed on the target machine.
+However, since it is self-contained, it must be built for each target platform separately.
+By default, the template is configured to build for:
+* `win-x64`
+* `win-arm64`
+* `osx-arm64`
+* `linux-x64`
+* `linux-arm64`
+* `linux-musl-x64`
+
+If you require more platforms to be supported, update the list of runtime identifiers in the project's `` element.
+#### ---#else
+The MCP server is built as a framework-dependent application and requires the ASP.NET Core runtime to be installed on the target machine.
+The application is configured to roll-forward to the next highest major version of the runtime if one is available on the target machine.
+If an applicable .NET runtime is not available, the MCP server will not start.
+Consider building the MCP server as a self-contained application if you want to avoid this dependency.
+#### ---#endif
+
+Please note that this template is currently in an early preview stage. If you have feedback, please take a [brief survey](http://aka.ms/dotnet-mcp-template-survey).
+
+## Developing locally
+
+To test this MCP server from source code (locally), you can configure your IDE to connect to the server using localhost.
+
+#### ---#if (hostIdentifier == "vs")
+```json
+{
+ "servers": {
+ "McpServer-CSharp": {
+ "type": "http",
+ "url": "https://localhost:9995"
+ }
+ }
+}
+```
+#### ---#else
+```json
+{
+ "servers": {
+ "McpServer-CSharp": {
+ "type": "http",
+ "url": "http://localhost:9996"
+ }
+ }
+}
+```
+#### ---#endif
+
+Refer to the VS Code or Visual Studio documentation for more information on configuring and using MCP servers:
+
+- [Use MCP servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers)
+- [Use MCP servers in Visual Studio (Preview)](https://learn.microsoft.com/visualstudio/ide/mcp-servers)
+
+## Testing the MCP Server
+
+Once configured, you can ask Copilot Chat for a random number, for example, `Give me 3 random numbers`. It should prompt you to use the `get_random_number` tool on the `McpServer-CSharp` MCP server and show you the results.
+
+## Known issues
+
+1. When using VS Code, connecting to `https://localhost:9995` fails.
+ * This is related to using a self-signed developer certificate, even when the certificate is trusted by the system.
+ * Connecting with `http://localhost:9996` succeeds.
+ * See [Cannot connect to MCP server via SSE using trusted developer certificate (microsoft/vscode#248170)](https://github.com/microsoft/vscode/issues/248170) for more information.
+
+## More information
+
+ASP.NET Core MCP servers use the [ModelContextProtocol.AspNetCore](https://www.nuget.org/packages/ModelContextProtocol.AspNetCore) package from the MCP C# SDK. For more information about MCP:
+
+- [Official Documentation](https://modelcontextprotocol.io/)
+- [Protocol Specification](https://spec.modelcontextprotocol.io/)
+- [GitHub Organization](https://github.com/modelcontextprotocol)
+- [MCP C# SDK](https://modelcontextprotocol.github.io/csharp-sdk)
diff --git a/src/ProjectTemplates/README.md b/src/ProjectTemplates/README.md
index f527c08d74e..335a3881d96 100644
--- a/src/ProjectTemplates/README.md
+++ b/src/ProjectTemplates/README.md
@@ -2,10 +2,12 @@
## Updating project template JavaScript dependencies
-To update project template JavaScript dependencies:
+The AIChatWeb project template within Microsoft.Extensions.AI.Templates bundles JavaScript dependencies into the package. To update those project template JavaScript dependencies:
+
+1. Navigate into the root of the Microsoft.Extensions.AI.Templates directory
1. Install a recent build of Node.js
2. Update the `package.json` file with added or updated dependencies
-3. Run the following commands from this directory:
+3. Run the following commands:
```sh
npm install
npm run copy-dependencies
@@ -23,7 +25,7 @@ There are template execution tests in the `test/ProjectTemplates` folders that c
However, CG can't detect JS dependencies by scanning execution test output, because the generated projects don't contain manifests describing JS dependencies. Instead, we have a `package.json` and `package-lock.json` in the same folder as this README that define which JS dependencies get included in the template and how they get copied into template content (see previous section in this document). CG then automatically tracks packages listed in this `package-lock.json`.
-## Build the templates using just-built library package versions
+## Build the templates
By default the templates use just-built versions of library packages from this repository, so NuGet packages must be produced before the templates can be run:
@@ -35,24 +37,84 @@ By default the templates use just-built versions of library packages from this r
Once the library packages are built, the template packages can be built with references to the local package versions using the following commands:
```pwsh
-.\build.cmd -pack -projects .\src\ProjectTemplates\Microsoft.Agents.AI.ProjectTemplates\Microsoft.Extensions.AI.Templates.csproj
-.\build.cmd -pack -projects .\src\ProjectTemplates\Microsoft.Extensions.AI.Templates\Microsoft.Extensions.AI.Templates.csproj
+.\build.cmd -build -pack -projects .\src\ProjectTemplates\Microsoft.Agents.AI.ProjectTemplates\Microsoft.Agents.AI.ProjectTemplates.csproj
+.\build.cmd -build -pack -projects .\src\ProjectTemplates\Microsoft.Extensions.AI.Templates\Microsoft.Extensions.AI.Templates.csproj
```
-## Build the templates using pinned library package versions
+## Package references in the project templates
-The templates can also be built to reference pinned versions of the library packages. This approach is used when a templates package is updated off-cycle from the library packages. The pinned versions are hard-coded in the `GeneratedContent.targets` file in this directory. To build the templates package using the pinned versions, run:
+The `Directory.Build.targets` file defines and configures the necessary targets for processing package references in the project template to insert the package versions into the produced `.csproj` files.
-```pwsh
-.\build.cmd -pack -projects .\src\ProjectTemplates\Microsoft.Agents.AI.ProjectTemplates\Microsoft.Agents.AI.ProjectTemplates.csproj /p:TemplateUsePinnedPackageVersions=true
-.\build.cmd -pack -projects .\src\ProjectTemplates\Microsoft.Extensions.AI.Templates\Microsoft.Extensions.AI.Templates.csproj /p:TemplateUsePinnedPackageVersions=true
+Template projects can reference packages either with pinned `` or have versions resolved from projects within the repository using `` items. If both a `` and `` are specified, the version from
+the `` is used.
+
+```xml
+
+
+
+
+
+
+
+
+
+
+
```
-Setting `/p:TemplateUsePinnedPackageVersions=true` will apply three different categories of pinned package versions:
+Files in the template that need to reference the resolved versions must be pre-processed as generated template content. While this works with any text file, it is typically used with `.csproj` files. This is accomplished by:
+
+1. Rename the `.csproj` file to `.csproj-in`
+2. Exclude the `.csproj-in` file from the project ``
+3. Include the `.csproj-in` file in the project's ``
+
+**Project template project**
+```xml
+
+
-1. Packages from this repository that are _not_ part of `Microsoft.Extensions.AI*`, namely `Microsoft.Extensions.Http.Resilience`
-2. Packages from this repository that _are_ part of `Microsoft.Extensions.AI*`
-3. The `Microsoft.EntityFrameworkCoreSqlite` package
+
+
+
+
+```
+
+Note that for the 'ChangeExtension' behavior to work, the extension to be replaced cannot contain a '.'. Therefore, `.csproj.in` cannot be used, which is why `.csproj-in` is used instead. This is true for any extension, so `.md-in` can also be changed to `.md` using this same logic.
+
+**Project template csproj-in file**
+```xml
+
+...
+
+...
+
+...
+
+```
+
+During build, the generated content is saved into the `/artifacts/ProjectTemplates/GeneratedContent` folder, and the generated content is then added as `` included from the artifacts folder.
## Installing the templates locally
@@ -77,20 +139,32 @@ dotnet new install .\artifacts\packages\Debug\Shipping\Microsoft.Extensions.AI.T
Finally, create a project from the template and run it:
```pwsh
-dotnet new aiagent-webapi `
- [--provider ] `
- [--managed-identity]
+ dotnet new aiagent-webapi `
+ [--provider ] `
+ [--managed-identity]
# or
-dotnet new aichatweb `
- [--provider ] `
- [--vector-store ] `
- [--aspire] `
- [--managed-identity]
+ dotnet new aichatweb `
+ [--provider ] `
+ [--vector-store ] `
+ [--aspire] `
+ [--managed-identity]
-# If using `--aspire`, cd into the *AppHost directory
-# Follow the instructions in the generated README for setting the necessary user-secrets
+ # If using `--aspire`, cd into the *AppHost directory
+ # Follow the instructions in the generated README for setting the necessary user-secrets
+
+# or
+
+ dotnet new mcpserver [--aot] [--self-contained]
dotnet run
```
+
+## Cleaning ProjectTemplate build output
+
+Running the `clean` target for a Project Template project will remove its entire artifacts folder. This includes:
+
+- `/artifacts/ProjectTemplates//GeneratedContent` (generated template content files)
+- `/artifacts/ProjectTemplates//Sandbox` (execution test sandbox)
+- `/artifacts/ProjectTemplates//Snapshots` (snapshot test output)
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 09ea86b52b4..f886872fa3d 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,8 +1,8 @@
-
-
+
false
+ $(NoWarn);RT0000
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index ddaf65de061..8cddc800bac 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -14,8 +14,4 @@
-
-
- $(NoWarn);RT0000
-
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
new file mode 100644
index 00000000000..010335bc108
--- /dev/null
+++ b/test/Directory.Packages.props
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/test/ProjectTemplates/.gitignore b/test/ProjectTemplates/.gitignore
deleted file mode 100644
index 6fbeae3c400..00000000000
--- a/test/ProjectTemplates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*/ExecutionTestSandbox
diff --git a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestBase.cs b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestBase.cs
index 430f731e0c8..188f5022fd1 100644
--- a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestBase.cs
+++ b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestBase.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
@@ -29,6 +30,18 @@ protected TemplateExecutionTestBase(TemplateExecutionTestFixture fixture, ITestO
OutputHelper = outputHelper;
}
+ protected async Task CreateRestoreAndBuild(string projectName, string[] args, string? startupProjectRelativePath = null)
+ {
+ var project = await Fixture.CreateProjectAsync(
+ TConfiguration.Configuration.TemplateName,
+ projectName,
+ startupProjectRelativePath,
+ args);
+
+ await Fixture.RestoreProjectAsync(project);
+ await Fixture.BuildProjectAsync(project);
+ }
+
protected virtual void Dispose(bool disposing)
{
if (_disposed)
diff --git a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestClassFixtureBase.cs b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestClassFixtureBase.cs
index 9144593db73..4c9939d960a 100644
--- a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestClassFixtureBase.cs
+++ b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestClassFixtureBase.cs
@@ -15,9 +15,12 @@ namespace Microsoft.Shared.ProjectTemplates.Tests;
///
public abstract class TemplateExecutionTestClassFixtureBase : IAsyncLifetime
{
- private readonly TemplateExecutionTestConfiguration _configuration;
- private readonly string _templateTestOutputPath;
- private readonly string _customHivePath;
+ private readonly string _templatePackageName;
+ private readonly string _sandboxPackages;
+ private readonly string _sandboxOutput;
+ private readonly string _sandboxInstallPath;
+ private readonly string _sandboxProjectsPath;
+
private readonly MessageSinkTestOutputHelper _messageSinkTestOutputHelper;
private ITestOutputHelper? _currentTestOutputHelper;
@@ -30,46 +33,66 @@ public abstract class TemplateExecutionTestClassFixtureBase : IAsyncLifetime
protected TemplateExecutionTestClassFixtureBase(TemplateExecutionTestConfiguration configuration, IMessageSink messageSink)
{
- _configuration = configuration;
_messageSinkTestOutputHelper = new(messageSink);
- var outputFolderName = GetRandomizedFileName(prefix: _configuration.TestOutputFolderPrefix);
- _templateTestOutputPath = Path.Combine(WellKnownPaths.TemplateSandboxOutputRoot, outputFolderName);
- _customHivePath = Path.Combine(_templateTestOutputPath, "hive");
- }
+ _templatePackageName = configuration.TemplatePackageName;
+ _sandboxPackages = configuration.TemplateSandboxPackages;
+ _sandboxOutput = configuration.TemplateSandboxOutput;
- private static string GetRandomizedFileName(string prefix)
- => prefix + "_" + Guid.NewGuid().ToString("N").Substring(0, 10).ToLowerInvariant();
+ _sandboxInstallPath = Path.Combine(_sandboxOutput, "install");
+ _sandboxProjectsPath = Path.Combine(_sandboxOutput, "projects");
+ }
public async Task InitializeAsync()
{
- Directory.CreateDirectory(_templateTestOutputPath);
+ // Here, we clear execution test output from the previous test run, if it exists.
+ // It's critical that this clearing happens *before* the tests start, *not* after they complete.
+ //
+ // This is because:
+ // 1. This enables debugging the previous test run by building/running generated projects manually.
+ // 2. The existence of a project.assets.json file on disk is what allows template content to get discovered
+ // for component governance reporting.
+ // Copy the template sandbox infrastructure to the output location for use during tests
+ CopySandboxDirectory(WellKnownPaths.TemplateSandboxSource, _sandboxOutput);
+
+ var installResult = await new DotNetNewCommand("install", _templatePackageName)
+ .WithWorkingDirectory(_sandboxInstallPath)
+ .WithEnvironmentVariable("LOCAL_SHIPPING_PATH", WellKnownPaths.LocalShippingPackagesPath)
+ .WithEnvironmentVariable("NUGET_PACKAGES", _sandboxPackages)
+ .WithCustomHive(_sandboxInstallPath)
+ .ExecuteAsync(OutputHelper);
+
+ installResult.AssertSucceeded($"dotnet new install {_templatePackageName}");
- await InstallTemplatesAsync();
+ // Create the sub-directory for the generated projects
+ Directory.CreateDirectory(_sandboxProjectsPath);
+ }
- async Task InstallTemplatesAsync()
+ private static void CopySandboxDirectory(string sandboxSource, string testSandbox)
+ {
+ if (Directory.Exists(testSandbox))
{
- var installSandboxPath = Path.Combine(_templateTestOutputPath, "install");
- Directory.CreateDirectory(installSandboxPath);
+ Directory.Delete(testSandbox, recursive: true);
+ }
- var installNuGetConfigPath = Path.Combine(installSandboxPath, "nuget.config");
- File.Copy(WellKnownPaths.TemplateInstallNuGetConfigPath, installNuGetConfigPath);
+ Directory.CreateDirectory(testSandbox);
- var installResult = await new DotNetNewCommand("install", _configuration.TemplatePackageName)
- .WithWorkingDirectory(installSandboxPath)
- .WithEnvironmentVariable("LOCAL_SHIPPING_PATH", WellKnownPaths.LocalShippingPackagesPath)
- .WithEnvironmentVariable("NUGET_PACKAGES", WellKnownPaths.NuGetPackagesPath)
- .WithCustomHive(_customHivePath)
- .ExecuteAsync(OutputHelper);
+ var source = new DirectoryInfo(sandboxSource);
- installResult.AssertSucceeded($"dotnet new install {_configuration.TemplatePackageName}");
+ foreach (FileInfo file in source.GetFiles())
+ {
+ file.CopyTo(Path.Combine(testSandbox, file.Name));
+ }
+
+ foreach (DirectoryInfo subDir in source.GetDirectories())
+ {
+ CopySandboxDirectory(subDir.FullName, Path.Combine(testSandbox, subDir.Name));
}
}
- public async Task CreateProjectAsync(string templateName, string projectName, params string[] args)
+ public async Task CreateProjectAsync(string templateName, string projectName, string? startupProjectRelativePath, params string[] args)
{
- var outputFolderName = GetRandomizedFileName(projectName);
- var outputFolderPath = Path.Combine(_templateTestOutputPath, outputFolderName);
+ var outputFolderPath = Path.Combine(_sandboxProjectsPath, projectName);
ReadOnlySpan dotNetNewCommandArgs = [
templateName,
@@ -82,16 +105,13 @@ .. args
var testDescription = string.Join(' ', dotNetNewCommandArgs);
var newProjectResult = await new DotNetNewCommand(dotNetNewCommandArgs)
- .WithWorkingDirectory(_templateTestOutputPath)
- .WithCustomHive(_customHivePath)
+ .WithWorkingDirectory(_sandboxProjectsPath)
+ .WithCustomHive(_sandboxInstallPath)
.ExecuteAsync(OutputHelper);
newProjectResult.AssertSucceeded(testDescription);
- var templateNuGetConfigPath = Path.Combine(outputFolderPath, "nuget.config");
- File.Copy(WellKnownPaths.TemplateTestNuGetConfigPath, templateNuGetConfigPath);
-
- return new Project(outputFolderPath, projectName);
+ return new Project(outputFolderPath, projectName) { StartupProjectRelativePath = startupProjectRelativePath };
}
public async Task RestoreProjectAsync(Project project)
@@ -99,7 +119,7 @@ public async Task RestoreProjectAsync(Project project)
var restoreResult = await new DotNetCommand("restore")
.WithWorkingDirectory(project.StartupProjectFullPath)
.WithEnvironmentVariable("LOCAL_SHIPPING_PATH", WellKnownPaths.LocalShippingPackagesPath)
- .WithEnvironmentVariable("NUGET_PACKAGES", WellKnownPaths.NuGetPackagesPath)
+ .WithEnvironmentVariable("NUGET_PACKAGES", _sandboxPackages)
.ExecuteAsync(OutputHelper);
restoreResult.AssertSucceeded($"""
@@ -107,7 +127,7 @@ dotnet restore
Working Directory: {project.StartupProjectFullPath}
Local Shipping Path: {WellKnownPaths.LocalShippingPackagesPath}
- NuGet Packages Path: {WellKnownPaths.NuGetPackagesPath}
+ NuGet Packages Path: {_sandboxPackages}
""");
}
diff --git a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollection.cs b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollection.cs
index dfabfb9a089..608b51eac07 100644
--- a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollection.cs
+++ b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollection.cs
@@ -6,7 +6,7 @@
namespace Microsoft.Shared.ProjectTemplates.Tests;
[CollectionDefinition(name: Name)]
-public sealed class TemplateExecutionTestCollection : ICollectionFixture
+public sealed class TemplateExecutionTestCollection
{
public const string Name = "Template execution test";
}
diff --git a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollectionFixture.cs b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollectionFixture.cs
deleted file mode 100644
index 3b015d80202..00000000000
--- a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestCollectionFixture.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.IO;
-
-namespace Microsoft.Shared.ProjectTemplates.Tests;
-
-///
-/// Provides functionality scoped to the lifetime of all tests defined in
-/// test classes extending .
-///
-public sealed class TemplateExecutionTestCollectionFixture
-{
- public TemplateExecutionTestCollectionFixture()
- {
- // Here, we clear execution test output from the previous test run, if it exists.
- //
- // It's critical that this clearing happens *before* the tests start, *not* after they complete.
- //
- // This is because:
- // 1. This enables debugging the previous test run by building/running generated projects manually.
- // 2. The existence of a project.assets.json file on disk is what allows template content to get discovered
- // for component governance reporting.
- if (Directory.Exists(WellKnownPaths.TemplateSandboxOutputRoot))
- {
- Directory.Delete(WellKnownPaths.TemplateSandboxOutputRoot, recursive: true);
- }
-
- // Then we copy the template sandbox infrastructure to the output location for use during tests.
- Directory.CreateDirectory(WellKnownPaths.TemplateSandboxOutputRoot);
-
- foreach (var filePath in Directory.EnumerateFiles(WellKnownPaths.TemplateSandboxSource))
- {
- var fileName = Path.GetFileName(filePath);
- var destFilePath = Path.Combine(WellKnownPaths.TemplateSandboxOutputRoot, fileName);
- File.Copy(filePath, destFilePath);
- }
- }
-}
diff --git a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestConfiguration.cs b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestConfiguration.cs
index 060f28fe368..cf6bb3e5934 100644
--- a/test/ProjectTemplates/Infrastructure/TemplateExecutionTestConfiguration.cs
+++ b/test/ProjectTemplates/Infrastructure/TemplateExecutionTestConfiguration.cs
@@ -1,11 +1,16 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System.IO;
+
namespace Microsoft.Shared.ProjectTemplates.Tests;
public sealed class TemplateExecutionTestConfiguration
{
public required string TemplatePackageName { get; init; }
+ public required string TemplateName { get; init; }
- public required string TestOutputFolderPrefix { get; init; }
+ private string TemplateSandboxRoot => Path.Combine(WellKnownPaths.ProjectTemplatesArtifactsRoot, TemplatePackageName, "Sandbox");
+ public string TemplateSandboxPackages => Path.Combine(TemplateSandboxRoot, "packages");
+ public string TemplateSandboxOutput => Path.Combine(TemplateSandboxRoot, TemplateName);
}
diff --git a/test/ProjectTemplates/Infrastructure/TemplateSandbox/README.md b/test/ProjectTemplates/Infrastructure/TemplateSandbox/README.md
index 6a9ecb84b86..839ee778551 100644
--- a/test/ProjectTemplates/Infrastructure/TemplateSandbox/README.md
+++ b/test/ProjectTemplates/Infrastructure/TemplateSandbox/README.md
@@ -17,15 +17,16 @@ Template tests can be debugged either in VS or by running `dotnet test`.
However, it's sometimes helpful to debug failures by building, running, and modifying the generated projects directly instead of tinkering with test code.
To help with this scenario:
-* The `ExecutionTestSandbox` folder containing the generated projects doesn't get cleared until the start of the next test run.
+* The `/artifacts/ProjectTemplates/Sandbox/` folder containing the generated projects doesn't get cleared until the start of the next test run.
* An `activate.ps1` script can be used to simulate the environment that the template execution tests use. This script:
* Sets the active .NET installation to `/.dotnet`.
- * Sets the `NUGET_PACKAGES` environment variable to the `ExecutionTestSandbox/packages` folder to use the isolated package cache.
+ * Sets the `NUGET_PACKAGES` environment variable to the `/artifacts/ProjectTemplates/Sandbox//packages` folder to use the isolated package cache.
* Sets a `LOCAL_SHIPPING_PATH` environment variable so that locally-built packages can get picked up during restore.
As an example, here's how you can build a project generated by the tests:
```sh
+cd /artifacts/ProjectTemplates/Sandbox/
. ./activate.ps1
-cd ./[test_collection]/[generated_template]
+cd .//
dotnet build
```
diff --git a/test/ProjectTemplates/Infrastructure/TemplateSandbox/nuget.template_install.config b/test/ProjectTemplates/Infrastructure/TemplateSandbox/install/nuget.config
similarity index 100%
rename from test/ProjectTemplates/Infrastructure/TemplateSandbox/nuget.template_install.config
rename to test/ProjectTemplates/Infrastructure/TemplateSandbox/install/nuget.config
diff --git a/test/ProjectTemplates/Infrastructure/TemplateSandbox/Directory.Build.props b/test/ProjectTemplates/Infrastructure/TemplateSandbox/projects/Directory.Build.props
similarity index 100%
rename from test/ProjectTemplates/Infrastructure/TemplateSandbox/Directory.Build.props
rename to test/ProjectTemplates/Infrastructure/TemplateSandbox/projects/Directory.Build.props
diff --git a/test/ProjectTemplates/Infrastructure/TemplateSandbox/Directory.Build.targets b/test/ProjectTemplates/Infrastructure/TemplateSandbox/projects/Directory.Build.targets
similarity index 100%
rename from test/ProjectTemplates/Infrastructure/TemplateSandbox/Directory.Build.targets
rename to test/ProjectTemplates/Infrastructure/TemplateSandbox/projects/Directory.Build.targets
diff --git a/test/ProjectTemplates/Infrastructure/TemplateSandbox/nuget.template_test.config b/test/ProjectTemplates/Infrastructure/TemplateSandbox/projects/nuget.config
similarity index 100%
rename from test/ProjectTemplates/Infrastructure/TemplateSandbox/nuget.template_test.config
rename to test/ProjectTemplates/Infrastructure/TemplateSandbox/projects/nuget.config
diff --git a/test/ProjectTemplates/Infrastructure/TemplateSnapshotTestBase.cs b/test/ProjectTemplates/Infrastructure/TemplateSnapshotTestBase.cs
new file mode 100644
index 00000000000..d716d0d5d8b
--- /dev/null
+++ b/test/ProjectTemplates/Infrastructure/TemplateSnapshotTestBase.cs
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.Linq;
+using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
+
+namespace Microsoft.Shared.ProjectTemplates.Tests;
+
+public abstract class TemplateSnapshotTestBase
+{
+ protected virtual TemplateVerifierOptions PrepareSnapshotVerifier(
+ string projectNamePrefix,
+ string templatePackageName,
+ string templateName,
+ string[] templateArgs,
+ string[]? verificationExcludePatterns = null)
+ {
+ // TemplateVerifierOptions.DoNotPrependTemplateNameToScenarioName results in a '_' prefix.
+ // So skip setting a prefix here and let TemplateVerifier use the template name prefix.
+ string scenarioName = TemplateTestUtilities.GetProjectNameForArgs(templateArgs);
+
+ // Create a working directory using the same prefixing approach as the TemplateVerifier
+ // to improve the debugging experience
+ string workingDir = Path.Combine(WellKnownPaths.ProjectTemplatesArtifactsRoot, templatePackageName, "Snapshots", templateName, $"{templateName}.{scenarioName}");
+
+ // Ensure the working directory is clean
+ if (Directory.Exists(workingDir))
+ {
+ Directory.Delete(workingDir, recursive: true);
+ }
+
+ // Get the template location from the template package. Use a wildcard for the version number in the file name.
+ string templateLocation = Path.Combine(WellKnownPaths.LocalShippingPackagesPath, $"{templatePackageName}.*.nupkg");
+
+ string[]? excludePatterns = Path.DirectorySeparatorChar is '/'
+ ? verificationExcludePatterns
+ : verificationExcludePatterns?.Select(p => p.Replace('/', Path.DirectorySeparatorChar)).ToArray();
+
+ return new TemplateVerifierOptions(templateName)
+ {
+ TemplatePath = templateLocation,
+ TemplateSpecificArgs = templateArgs,
+ SnapshotsDirectory = Path.Combine("Snapshots", templateName),
+ OutputDirectory = workingDir,
+ DoNotPrependCallerMethodNameToScenarioName = true,
+ DoNotAppendTemplateArgsToScenarioName = true,
+ ScenarioName = scenarioName,
+ VerificationExcludePatterns = excludePatterns
+ };
+ }
+}
diff --git a/test/ProjectTemplates/Infrastructure/TemplateTestUtilities.cs b/test/ProjectTemplates/Infrastructure/TemplateTestUtilities.cs
new file mode 100644
index 00000000000..58fe84b7198
--- /dev/null
+++ b/test/ProjectTemplates/Infrastructure/TemplateTestUtilities.cs
@@ -0,0 +1,95 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Shared.ProjectTemplates.Tests;
+
+public static class TemplateTestUtilities
+{
+ /// Create a sanitized and standardized project name from the supplied args
+ ///
+ /// Framework name is shortened from "net10.0" to "net10", e.g.
+ /// Boolean options explicitly set to "true" use the option name followed by '_T'.
+ /// Boolean options explicitly set to "false" use the option name followed by '_F'.
+ /// Options with names and values use only the option value.
+ /// Options without values use the option name.
+ /// Non-word characters are removed.
+ /// Empty values are removed.
+ ///
+ /// Name parts are abbreviated to avoid path length limits
+ /// - AzureOpenAI -> aoai
+ /// - GitHubModels -> gh
+ /// - Ollama -> o
+ /// - OpenAI -> oai
+ /// - AzureAISearch -> aais
+ /// - Qdrant -> q
+ /// - Local -> l
+ /// - Aspire -> A
+ /// - ManagedIdentity -> ID
+ /// - aot -> AOT
+ /// - SelfContained -> SC
+ ///
+ public static string GetProjectNameForArgs(string[] args, string? prefix = null)
+ {
+ IEnumerable nameParts = args
+ .Select(arg => Regex.Replace(arg, @"-(?:f|-[Ff]ramework)=(net[0-9]+)\.0", "$1"))
+ .Select(arg => Regex.Replace(arg, "--(.*?)=true", "$1_T"))
+ .Select(arg => Regex.Replace(arg, "--(.*?)=false", "$1_F"))
+ .Select(arg => Regex.Replace(arg, "--(.*?)=(.*)", "$2"))
+ .Select(arg => Regex.Replace(arg, "--(.*)", "$1"))
+ .Select(arg => Regex.Replace(arg, @"\W", ""))
+ .Select(arg => arg
+ .Replace("azureopenai", "aoai")
+ .Replace("githubmodels", "gh")
+ .Replace("ollama", "o")
+ .Replace("openai", "oai")
+ .Replace("azureaisearch", "aais")
+ .Replace("qdrant", "q")
+ .Replace("local", "l")
+ .Replace("aspire", "A")
+ .Replace("managedidentity", "ID")
+ .Replace("aot", "AOT")
+ .Replace("selfcontained", "SC"))
+ .Where(arg => !string.IsNullOrEmpty(arg));
+
+ return (nameParts.Any(), prefix is not null) switch
+ {
+ (false, false) => "_defaults",
+ (false, true) => $"{prefix}_defaults",
+ (true, false) => string.Join('_', nameParts),
+ _ => string.Join('_', nameParts.Prepend(prefix)),
+ };
+ }
+
+ /// Gets all combinations of options provided for a project template.
+ public static IEnumerable GetPossibleOptions(ReadOnlyMemory<(string name, string[] values)> options)
+ {
+ if (options.Length == 0)
+ {
+ yield return [];
+ yield break;
+ }
+
+ var firstOption = options.Span[0];
+
+ foreach (var value in firstOption.values)
+ {
+ foreach (var otherOptions in GetPossibleOptions(options[1..]))
+ {
+ yield return [$"{firstOption.name}={value}", .. otherOptions];
+ }
+ }
+ }
+
+ /// Checks for a specific option/value pair
+ public static bool HasOption(string[] args, string option, string value) =>
+ args.Contains($"{option}={value}");
+
+ /// Checks for a boolean option to be specified
+ public static bool HasOption(string[] args, string option) =>
+ args.Contains(option) || args.Contains($"{option}=true");
+}
diff --git a/test/ProjectTemplates/Infrastructure/VerifyScrubbers.cs b/test/ProjectTemplates/Infrastructure/VerifyScrubbers.cs
index 505feb99c14..1fa35f33a5e 100644
--- a/test/ProjectTemplates/Infrastructure/VerifyScrubbers.cs
+++ b/test/ProjectTemplates/Infrastructure/VerifyScrubbers.cs
@@ -1,13 +1,59 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using System;
+using System.IO;
using System.Text;
using System.Text.RegularExpressions;
+using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
namespace Microsoft.Shared.ProjectTemplates.Tests;
internal static class VerifyScrubbers
{
+ public static ScrubbersDefinition AddSolutionFileGuidScrubber(this ScrubbersDefinition scrubbers) => scrubbers
+ .AddScrubber(
+ content => content.ScrubByRegex(pattern: @"\{.{36}\}", replacement: "{00000000-0000-0000-0000-000000000000}"),
+ extension: "sln");
+
+ public static ScrubbersDefinition AddUserSecretsScrubber(this ScrubbersDefinition scrubbers) => scrubbers
+ .AddScrubber(
+ content => content.ScrubByRegex(pattern: ".{36}", replacement: "{00000000-0000-0000-0000-000000000000}"),
+ extension: "csproj");
+
+ public static ScrubbersDefinition AddPackageReferenceScrubber(this ScrubbersDefinition scrubbers) => scrubbers
+ .AddScrubber(
+ content => content.ScrubByRegex(
+ pattern: @"",
+ replacement: @""),
+ extension: "csproj");
+
+ public static ScrubbersDefinition AddLocalhostPortScrubber(
+ this ScrubbersDefinition scrubbers,
+ (string pattern, string replacement)? https = null,
+ (string pattern, string replacement)? http = null)
+ {
+ https ??= (@"\d{4,5}", "9995");
+ http ??= (@"\d{4,5}", "9996");
+
+ Action scrubPorts = content =>
+ {
+ content.ScrubByRegex($@"(https://localhost):({https.Value.pattern})", $"$1:{https.Value.replacement}");
+ content.ScrubByRegex($@"(http://localhost):({http.Value.pattern})", $"$1:{http.Value.replacement}");
+ };
+
+ return scrubbers
+ .AddScrubber(scrubPorts, extension: "md")
+ .AddScrubber(scrubPorts, extension: "http")
+ .AddScrubber((path, content) =>
+ {
+ if (Path.GetFileName(path).Equals("launchSettings.json", StringComparison.OrdinalIgnoreCase))
+ {
+ scrubPorts(content);
+ }
+ });
+ }
+
///
/// Removes content after "Details: ".
///
diff --git a/test/ProjectTemplates/Infrastructure/WellKnownPaths.cs b/test/ProjectTemplates/Infrastructure/WellKnownPaths.cs
index 0ebb196fe84..3a30f84d4ff 100644
--- a/test/ProjectTemplates/Infrastructure/WellKnownPaths.cs
+++ b/test/ProjectTemplates/Infrastructure/WellKnownPaths.cs
@@ -9,38 +9,32 @@ namespace Microsoft.Shared.ProjectTemplates.Tests;
internal static class WellKnownPaths
{
+ private const string BuildConfigurationFolder =
+#if DEBUG
+ "Debug";
+#else
+ "Release";
+#endif
+
public static readonly string RepoRoot;
public static readonly string RepoDotNetExePath;
- public static readonly string ThisProjectRoot;
+ public static readonly string LocalShippingPackagesPath;
+ public static readonly string ProjectTemplatesArtifactsRoot;
- public static readonly string TemplateFeedLocation;
+ // Execution Test Paths
public static readonly string TemplateSandboxSource;
- public static readonly string TemplateSandboxOutputRoot;
- public static readonly string TemplateInstallNuGetConfigPath;
public static readonly string TemplateTestNuGetConfigPath;
- public static readonly string LocalShippingPackagesPath;
- public static readonly string NuGetPackagesPath;
static WellKnownPaths()
{
RepoRoot = GetRepoRoot();
RepoDotNetExePath = GetRepoDotNetExePath();
- ThisProjectRoot = ProjectRootHelper.GetThisProjectRoot();
- TemplateFeedLocation = Path.Combine(RepoRoot, "src", "ProjectTemplates");
+ ProjectTemplatesArtifactsRoot = Path.Combine(RepoRoot, "artifacts", "ProjectTemplates");
TemplateSandboxSource = Path.Combine(RepoRoot, "test", "ProjectTemplates", "Infrastructure", "TemplateSandbox");
- TemplateSandboxOutputRoot = Path.Combine(ThisProjectRoot, "ExecutionTestSandbox");
- TemplateInstallNuGetConfigPath = Path.Combine(TemplateSandboxSource, "nuget.template_install.config");
- TemplateTestNuGetConfigPath = Path.Combine(TemplateSandboxSource, "nuget.template_test.config");
+ TemplateTestNuGetConfigPath = Path.Combine(TemplateSandboxSource, "nuget.config");
- const string BuildConfigurationFolder =
-#if DEBUG
- "Debug";
-#else
- "Release";
-#endif
LocalShippingPackagesPath = Path.Combine(RepoRoot, "artifacts", "packages", BuildConfigurationFolder, "Shipping");
- NuGetPackagesPath = Path.Combine(TemplateSandboxOutputRoot, "packages");
}
private static string GetRepoRoot()
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/AIAgentWebAPIExecutionTests.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/AIAgentWebAPIExecutionTests.cs
new file mode 100644
index 00000000000..675fb642aa6
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/AIAgentWebAPIExecutionTests.cs
@@ -0,0 +1,65 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Shared.ProjectTemplates.Tests;
+using Xunit;
+using Xunit.Abstractions;
+using static Microsoft.Shared.ProjectTemplates.Tests.TemplateTestUtilities;
+
+namespace Microsoft.Agents.AI.ProjectTemplates.Tests;
+
+///
+/// Contains execution tests for the "AI Agent Web API" template.
+///
+///
+/// In addition to validating that the templates build and restore correctly,
+/// these tests are also responsible for template component governance reporting.
+/// This is because the generated output is left on disk after tests complete,
+/// most importantly the project.assets.json file that gets created during restore.
+/// Therefore, it's *critical* that these tests remain in a working state,
+/// as disabling them will also disable CG reporting.
+///
+public class AIAgentWebAPIExecutionTests : TemplateExecutionTestBase, ITemplateExecutionTestConfigurationProvider
+{
+ public AIAgentWebAPIExecutionTests(TemplateExecutionTestFixture fixture, ITestOutputHelper outputHelper)
+ : base(fixture, outputHelper)
+ {
+ }
+
+ public static TemplateExecutionTestConfiguration Configuration { get; } = new()
+ {
+ TemplatePackageName = "Microsoft.Agents.AI.ProjectTemplates",
+ TemplateName = "aiagent-webapi"
+ };
+
+ public static IEnumerable GetSupportedProjectConfigurations()
+ {
+ (string name, string[] values)[] allOptionValues = [
+ ("--provider", ["azureopenai", "githubmodels", "ollama", "openai"]),
+ ("--managed-identity", ["true", "false"]),
+ ("--framework", ["net8.0", "net9.0", "net10.0"])
+ ];
+
+ foreach (var args in GetPossibleOptions(allOptionValues))
+ {
+ // Managed Identity only applies when using an Azure service
+ if (HasOption(args, "--managed-identity") && !HasOption(args, "--provider", "azureopenai"))
+ {
+ continue;
+ }
+
+ yield return args;
+ }
+ }
+
+ // Do not skip. See XML docs for this test class.
+ [Theory]
+ [MemberData(nameof(GetSupportedProjectConfigurations))]
+ public async Task TestAllSupportedConfigurations(params string[] args)
+ {
+ string projectName = GetProjectNameForArgs(args, prefix: "AIAgentWebApi");
+ await CreateRestoreAndBuild(projectName, args);
+ }
+}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/AIAgentWebAPISnapshotTests.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/AIAgentWebAPISnapshotTests.cs
new file mode 100644
index 00000000000..a93915e3252
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/AIAgentWebAPISnapshotTests.cs
@@ -0,0 +1,51 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Shared.ProjectTemplates.Tests;
+using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
+using Microsoft.TemplateEngine.TestHelper;
+using Xunit;
+using Xunit.Abstractions;
+using static Microsoft.Shared.ProjectTemplates.Tests.TemplateTestUtilities;
+
+namespace Microsoft.Agents.AI.ProjectTemplates.Tests;
+
+public class AIAgentWebAPISnapshotTests : TemplateSnapshotTestBase
+{
+ private readonly ILogger _log;
+
+ public AIAgentWebAPISnapshotTests(ITestOutputHelper log)
+ {
+#pragma warning disable CA2000 // Dispose objects before losing scope
+ _log = new XunitLoggerProvider(log).CreateLogger("TestRun");
+#pragma warning restore CA2000 // Dispose objects before losing scope
+ }
+
+ [Theory]
+ [InlineData /* Defaults: --provider=githubmodels */]
+ [InlineData("--provider=ollama")]
+ [InlineData("--provider=openai")]
+ [InlineData("--provider=azureopenai", "--managed-identity=true")]
+ [InlineData("--provider=azureopenai", "--managed-identity=false")]
+ public async Task RunSnapshotTests(params string[] templateArgs)
+ {
+ string projectNamePrefix = "AIAgentWebApi";
+ string templatePackageName = "Microsoft.Agents.AI.ProjectTemplates";
+ string templateName = "aiagent-webapi";
+
+ TemplateVerifierOptions options = PrepareSnapshotVerifier(
+ projectNamePrefix,
+ templatePackageName,
+ templateName,
+ templateArgs)
+ .WithCustomScrubbers(ScrubbersDefinition.Empty
+ .AddUserSecretsScrubber()
+ .AddPackageReferenceScrubber()
+ .AddLocalhostPortScrubber());
+
+ VerificationEngine engine = new VerificationEngine(_log);
+ await engine.Execute(options);
+ }
+}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Microsoft.Agents.AI.ProjectTemplates.Tests.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Microsoft.Agents.AI.ProjectTemplates.Tests.csproj
index 1c529dff3f3..1ebf05491dc 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Microsoft.Agents.AI.ProjectTemplates.Tests.csproj
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Microsoft.Agents.AI.ProjectTemplates.Tests.csproj
@@ -17,16 +17,10 @@
-
-
-
-
-
-
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/ProjectRootHelper.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/ProjectRootHelper.cs
deleted file mode 100644
index baca09bf468..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/ProjectRootHelper.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.IO;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Shared.ProjectTemplates.Tests;
-
-///
-/// Contains a helper for determining the disk location of the containing project folder.
-///
-///
-/// It's important that this file resides in the root of the containing project, or the returned
-/// project root path will be incorrect.
-///
-internal static class ProjectRootHelper
-{
- public static string GetThisProjectRoot()
- => GetThisProjectRootCore();
-
- // This helper method is defined separately from its public variant because it extracts the
- // caller file path via the [CallerFilePath] attribute.
- // Therefore, the caller must be in a known location, i.e., this source file, to produce
- // a reliable result.
- private static string GetThisProjectRootCore([CallerFilePath] string callerFilePath = "")
- {
- if (Path.GetDirectoryName(callerFilePath) is not { Length: > 0 } testProjectRoot)
- {
- throw new InvalidOperationException("Could not determine the root of the test project.");
- }
-
- return testProjectRoot;
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/README.md
deleted file mode 100644
index 99247d4574c..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Snapshots
-
-This directory contains verified snapshots of generated template output. These snapshots are used by the template snapshot tests to ensure templates generate expected output.
-
-When template content is added, this directory will contain subdirectories for each test scenario.
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/Program.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/Program.cs
deleted file mode 100644
index 025dffc9c9f..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/Program.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.ClientModel;
-using System.ComponentModel;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.DevUI;
-using Microsoft.Agents.AI.Hosting;
-using Microsoft.Agents.AI.Workflows;
-using Microsoft.Extensions.AI;
-using OpenAI;
-using OpenAI.Chat;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// You will need to set the token to your own value
-// 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 "GITHUB_TOKEN" "your-github-models-token-here"
-var chatClient = new ChatClient(
- "gpt-4o-mini",
- new ApiKeyCredential(builder.Configuration["GITHUB_TOKEN"] ?? throw new InvalidOperationException("Missing configuration: GITHUB_TOKEN")),
- new OpenAIClientOptions { Endpoint = new Uri("https://models.inference.ai.azure.com") })
- .AsIChatClient();
-
-builder.Services.AddChatClient(chatClient);
-
-builder.AddAIAgent("writer", "You write short stories (300 words or less) about the specified topic.");
-
-builder.AddAIAgent("editor", (sp, key) => new ChatClientAgent(
- chatClient,
- name: key,
- instructions: "You edit short stories to improve grammar and style, ensuring the stories are less than 300 words. Once finished editing, you select a title and format the story for publishing.",
- tools: [AIFunctionFactory.Create(FormatStory)]
-));
-
-builder.AddWorkflow("publisher", (sp, key) => AgentWorkflowBuilder.BuildSequential(
- workflowName: key,
- sp.GetRequiredKeyedService("writer"),
- sp.GetRequiredKeyedService("editor")
-)).AddAsAIAgent();
-
-// Register services for OpenAI responses and conversations (also required for DevUI)
-builder.Services.AddOpenAIResponses();
-builder.Services.AddOpenAIConversations();
-
-var app = builder.Build();
-app.UseHttpsRedirection();
-
-// Map endpoints for OpenAI responses and conversations (also required for DevUI)
-app.MapOpenAIResponses();
-app.MapOpenAIConversations();
-
-if (builder.Environment.IsDevelopment())
-{
- // Map DevUI endpoint to /devui
- app.MapDevUI();
-}
-
-app.Run();
-
-[Description("Formats the story for publication, revealing its title.")]
-string FormatStory(string title, string story) => $"""
- **Title**: {title}
-
- {story}
- """;
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/README.md
deleted file mode 100644
index f13529d763e..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/README.md
+++ /dev/null
@@ -1,129 +0,0 @@
-# AI Agent Web API
-
-This is an AI Agent Web API application created from the `aiagent-webapi` template. This template is currently in a preview stage. If you have feedback, please take a [brief survey](https://aka.ms/dotnet/aiagent-webapi/preview1/survey).
-
-## Prerequisites
-
-- A GitHub Models API token (free to get started)
-
-## Getting Started
-
-### 1. Configure Your AI Service
-
-#### GitHub Models Configuration
-
-This application uses GitHub Models (model: gpt-4o-mini) for AI functionality. You'll need to configure your GitHub Models API token:
-
-**Option A: Using User Secrets (Recommended for Development)**
-
-```bash
-dotnet user-secrets set "GITHUB_TOKEN" "your-github-models-token-here"
-```
-
-**Option B: Using Environment Variables**
-
-Set the `GITHUB_TOKEN` environment variable:
-
-- **Windows (PowerShell)**:
- ```powershell
- $env:GITHUB_TOKEN = "your-github-models-token-here"
- ```
-
-- **Linux/macOS**:
- ```bash
- export GITHUB_TOKEN="your-github-models-token-here"
- ```
-
-#### Get a GitHub Models Token
-
-1. Visit [GitHub Models](https://github.com/marketplace/models)
-2. Sign in with your GitHub account
-3. Select a model (e.g., gpt-4o-mini)
-4. Click "Get API Key" or follow the authentication instructions
-5. Copy your personal access token
-
-
-### 2. Run the Application
-
-```bash
-dotnet run -lp https
-```
-
-The application will start and listen on:
-- HTTP: `http://localhost:9999`
-- HTTPS: `https://localhost:9999`
-
-### 3. Test the Application
-
-The application exposes OpenAI-compatible API endpoints. You can interact with the AI agents using any OpenAI-compatible client or tools.
-
-In development environments, a `/devui/` route is mapped to the Agent Framework development UI (DevUI), and when the app is launched through an IDE a browser will open to this URL. DevUI provides a web-based UI for interacting with agents and workflows. DevUI operates as an OpenAI-compatible client using the Responses and Conversations endpoints.
-
-## How It Works
-
-This application demonstrates Agent Framework with:
-
-1. **Writer Agent**: Writes short stories (300 words or less) about specified topics
-2. **Editor Agent**: Edits stories to improve grammar and style, ensuring they stay under 300 words
-3. **Publisher Workflow Agent**: A sequential workflow agent that combines the writer and editor agents
-
-The agents are exposed through OpenAI-compatible API endpoints, making them easy to integrate with existing tools and applications.
-
-## Template Parameters
-
-When creating a new project, you can customize it using template parameters:
-
-```bash
-# Specify AI service provider
-dotnet new aiagent-webapi --provider azureopenai
-
-# Specify a custom chat model
-dotnet new aiagent-webapi --chat-model gpt-4o
-
-# Use API key authentication for Azure OpenAI
-dotnet new aiagent-webapi --provider azureopenai --managed-identity false
-
-# Use Ollama with a different model
-dotnet new aiagent-webapi --provider ollama --chat-model llama3.1
-```
-
-### Available Parameters
-
-- **`--provider`**: Choose the AI service provider
- - `githubmodels` (default) - GitHub Models
- - `azureopenai` - Azure OpenAI
- - `openai` - OpenAI Platform
- - `ollama` - Ollama (local development)
-
-- **`--chat-model`**: Specify the chat model/deployment name
- - Default for OpenAI/Azure OpenAI/GitHub Models: `gpt-4o-mini`
- - Default for Ollama: `llama3.2`
-
-- **`--managed-identity`**: Use managed identity for Azure services (default: `true`)
- - Only applicable when `--provider azureopenai`
-
-- **`--framework`**: Target framework (default: `net10.0`)
- - Options: `net10.0`, `net9.0`, `net8.0`
-
-## Project Structure
-
-- `Program.cs` - Application entry point and configuration
-- `appsettings.json` - Application configuration
-- `Properties/launchSettings.json` - Launch profiles for development
-
-## Learn More
-
-- [AI apps for .NET developers](https://learn.microsoft.com/dotnet/ai)
-- [Microsoft Agent Framework Documentation](https://aka.ms/dotnet/agent-framework/docs)
-- [GitHub Models](https://github.com/marketplace/models)
-
-## Troubleshooting
-
-**Problem**: Application fails with "Missing configuration: GITHUB_TOKEN"
-
-**Solution**: Make sure you've configured your GitHub Models API token using one of the methods described above.
-
-**Problem**: API requests fail with authentication errors
-
-**Solution**: Verify your GitHub Models token is valid and hasn't expired. You may need to regenerate it from the GitHub Models website.
-
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/Properties/launchSettings.json
deleted file mode 100644
index c242aacc025..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/Properties/launchSettings.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "https://json.schemastore.org/launchsettings.json",
- "profiles": {
- "http": {
- "commandName": "Project",
- "dotnetRunMessages": true,
- "launchBrowser": true,
- "launchUrl": "devui/",
- "applicationUrl": "http://localhost:9999",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- "https": {
- "commandName": "Project",
- "dotnetRunMessages": true,
- "launchBrowser": true,
- "launchUrl": "devui/",
- "applicationUrl": "https://localhost:9999;http://localhost:9999",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- }
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/Properties/launchSettings.json
deleted file mode 100644
index c242aacc025..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/Properties/launchSettings.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "https://json.schemastore.org/launchsettings.json",
- "profiles": {
- "http": {
- "commandName": "Project",
- "dotnetRunMessages": true,
- "launchBrowser": true,
- "launchUrl": "devui/",
- "applicationUrl": "http://localhost:9999",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- "https": {
- "commandName": "Project",
- "dotnetRunMessages": true,
- "launchBrowser": true,
- "launchUrl": "devui/",
- "applicationUrl": "https://localhost:9999;http://localhost:9999",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- }
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/aiagent-webapi.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/aiagent-webapi.csproj
deleted file mode 100644
index 337bfdd220c..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/aiagent-webapi.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- net10.0
- enable
- enable
- secret
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/appsettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/appsettings.json
deleted file mode 100644
index 223027717b4..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/appsettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "AllowedHosts": "*"
-}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/Program.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/Program.cs
similarity index 92%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/Program.cs
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/Program.cs
index 025dffc9c9f..2744b8bb8af 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/Program.cs
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/Program.cs
@@ -33,9 +33,12 @@
builder.AddWorkflow("publisher", (sp, key) => AgentWorkflowBuilder.BuildSequential(
workflowName: key,
- sp.GetRequiredKeyedService("writer"),
- sp.GetRequiredKeyedService("editor")
-)).AddAsAIAgent();
+ agents:
+ [
+ sp.GetRequiredKeyedService("writer"),
+ sp.GetRequiredKeyedService("editor")
+ ]
+)).AddAsAIAgent("publisher-agent");
// Register services for OpenAI responses and conversations (also required for DevUI)
builder.Services.AddOpenAIResponses();
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/Properties/launchSettings.json
similarity index 82%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/Properties/launchSettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/Properties/launchSettings.json
index c242aacc025..d71b1876d35 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/Properties/launchSettings.json
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/Properties/launchSettings.json
@@ -6,7 +6,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "http://localhost:9999",
+ "applicationUrl": "http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@@ -16,7 +16,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "https://localhost:9999;http://localhost:9999",
+ "applicationUrl": "https://localhost:9995;http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/README.md
similarity index 98%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/README.md
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/README.md
index f13529d763e..8ea2640ad89 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/README.md
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/README.md
@@ -50,8 +50,8 @@ dotnet run -lp https
```
The application will start and listen on:
-- HTTP: `http://localhost:9999`
-- HTTPS: `https://localhost:9999`
+- HTTP: `http://localhost:9996`
+- HTTPS: `https://localhost:9995`
### 3. Test the Application
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/aiagent-webapi.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/aiagent-webapi.csproj
similarity index 69%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/aiagent-webapi.csproj
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/aiagent-webapi.csproj
index 337bfdd220c..6e5004343c4 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/aiagent-webapi.csproj
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/aiagent-webapi.csproj
@@ -4,16 +4,16 @@
net10.0enableenable
- secret
+ {00000000-0000-0000-0000-000000000000}
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/appsettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/appsettings.json
similarity index 100%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/appsettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi._defaults.verified/aiagent-webapi/appsettings.json
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/Program.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/Program.cs
similarity index 93%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/Program.cs
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/Program.cs
index ddc551393fa..3ece18c0d08 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/Program.cs
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/Program.cs
@@ -36,9 +36,12 @@
builder.AddWorkflow("publisher", (sp, key) => AgentWorkflowBuilder.BuildSequential(
workflowName: key,
- sp.GetRequiredKeyedService("writer"),
- sp.GetRequiredKeyedService("editor")
-)).AddAsAIAgent();
+ agents:
+ [
+ sp.GetRequiredKeyedService("writer"),
+ sp.GetRequiredKeyedService("editor")
+ ]
+)).AddAsAIAgent("publisher-agent");
// Register services for OpenAI responses and conversations (also required for DevUI)
builder.Services.AddOpenAIResponses();
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/Properties/launchSettings.json
similarity index 82%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/Properties/launchSettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/Properties/launchSettings.json
index c242aacc025..d71b1876d35 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/Properties/launchSettings.json
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/Properties/launchSettings.json
@@ -6,7 +6,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "http://localhost:9999",
+ "applicationUrl": "http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@@ -16,7 +16,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "https://localhost:9999;http://localhost:9999",
+ "applicationUrl": "https://localhost:9995;http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/README.md
similarity index 98%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/README.md
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/README.md
index de250a2916e..222e83f1188 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ApiKey.verified/aiagent-webapi/README.md
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/README.md
@@ -48,8 +48,8 @@ dotnet run -lp https
```
The application will start and listen on:
-- HTTP: `http://localhost:9999`
-- HTTPS: `https://localhost:9999`
+- HTTP: `http://localhost:9996`
+- HTTPS: `https://localhost:9995`
### 3. Test the Application
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/aiagent-webapi.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/aiagent-webapi.csproj
similarity index 69%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/aiagent-webapi.csproj
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/aiagent-webapi.csproj
index 337bfdd220c..6e5004343c4 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/aiagent-webapi.csproj
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/aiagent-webapi.csproj
@@ -4,16 +4,16 @@
net10.0enableenable
- secret
+ {00000000-0000-0000-0000-000000000000}
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/appsettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/appsettings.json
similarity index 100%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/appsettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_F.verified/aiagent-webapi/appsettings.json
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/Program.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/Program.cs
similarity index 93%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/Program.cs
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/Program.cs
index 3749e820b45..037ac3deb7e 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/Program.cs
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/Program.cs
@@ -38,9 +38,12 @@
builder.AddWorkflow("publisher", (sp, key) => AgentWorkflowBuilder.BuildSequential(
workflowName: key,
- sp.GetRequiredKeyedService("writer"),
- sp.GetRequiredKeyedService("editor")
-)).AddAsAIAgent();
+ agents:
+ [
+ sp.GetRequiredKeyedService("writer"),
+ sp.GetRequiredKeyedService("editor")
+ ]
+)).AddAsAIAgent("publisher-agent");
// Register services for OpenAI responses and conversations (also required for DevUI)
builder.Services.AddOpenAIResponses();
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/Properties/launchSettings.json
similarity index 82%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/Properties/launchSettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/Properties/launchSettings.json
index c242aacc025..d71b1876d35 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/Properties/launchSettings.json
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/Properties/launchSettings.json
@@ -6,7 +6,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "http://localhost:9999",
+ "applicationUrl": "http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@@ -16,7 +16,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "https://localhost:9999;http://localhost:9999",
+ "applicationUrl": "https://localhost:9995;http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/README.md
similarity index 98%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/README.md
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/README.md
index 3cb72789072..99157e36906 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/README.md
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/README.md
@@ -20,8 +20,8 @@ dotnet run -lp https
```
The application will start and listen on:
-- HTTP: `http://localhost:9999`
-- HTTPS: `https://localhost:9999`
+- HTTP: `http://localhost:9996`
+- HTTPS: `https://localhost:9995`
### 3. Test the Application
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/aiagent-webapi.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/aiagent-webapi.csproj
similarity index 63%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/aiagent-webapi.csproj
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/aiagent-webapi.csproj
index 0dab5ae9e6e..393be1ca919 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.AzureOpenAI_ManagedIdentity.verified/aiagent-webapi/aiagent-webapi.csproj
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/aiagent-webapi.csproj
@@ -4,17 +4,17 @@
net10.0enableenable
- secret
+ {00000000-0000-0000-0000-000000000000}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/appsettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/appsettings.json
similarity index 100%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/appsettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.aoai_ID_T.verified/aiagent-webapi/appsettings.json
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/Program.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/Program.cs
similarity index 91%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/Program.cs
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/Program.cs
index 2e9c6d25484..dfc311d6e17 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/Program.cs
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/Program.cs
@@ -25,9 +25,12 @@
builder.AddWorkflow("publisher", (sp, key) => AgentWorkflowBuilder.BuildSequential(
workflowName: key,
- sp.GetRequiredKeyedService("writer"),
- sp.GetRequiredKeyedService("editor")
-)).AddAsAIAgent();
+ agents:
+ [
+ sp.GetRequiredKeyedService("writer"),
+ sp.GetRequiredKeyedService("editor")
+ ]
+)).AddAsAIAgent("publisher-agent");
// Register services for OpenAI responses and conversations (also required for DevUI)
builder.Services.AddOpenAIResponses();
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/Properties/launchSettings.json
similarity index 82%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/Properties/launchSettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/Properties/launchSettings.json
index c242aacc025..d71b1876d35 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/Properties/launchSettings.json
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/Properties/launchSettings.json
@@ -6,7 +6,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "http://localhost:9999",
+ "applicationUrl": "http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@@ -16,7 +16,7 @@
"dotnetRunMessages": true,
"launchBrowser": true,
"launchUrl": "devui/",
- "applicationUrl": "https://localhost:9999;http://localhost:9999",
+ "applicationUrl": "https://localhost:9995;http://localhost:9996",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/README.md
similarity index 96%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/README.md
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/README.md
index 411f6c90acc..13f6f85451d 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/README.md
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/README.md
@@ -21,7 +21,7 @@ This application uses Ollama running locally (model: llama3.2). You'll need to h
```
3. Ensure Ollama is running (it starts automatically after installation)
-The application is configured to connect to Ollama at `http://localhost:9999`.
+The application is configured to connect to Ollama at `http://localhost:9996`.
### 2. Run the Application
@@ -31,8 +31,8 @@ dotnet run -lp https
```
The application will start and listen on:
-- HTTP: `http://localhost:9999`
-- HTTPS: `https://localhost:9999`
+- HTTP: `http://localhost:9996`
+- HTTPS: `https://localhost:9995`
### 3. Test the Application
@@ -104,7 +104,7 @@ dotnet new aiagent-webapi --provider ollama --chat-model llama3.1
**Solution**:
- Ensure Ollama is running. On macOS/Linux, check with `pgrep ollama`. On Windows, check Task Manager.
-- Verify Ollama is accessible at `http://localhost:9999`
+- Verify Ollama is accessible at `http://localhost:9996`
- Make sure you've downloaded the llama3.2 model: `ollama pull llama3.2`
**Problem**: Model responses are slow or time out
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/aiagent-webapi.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/aiagent-webapi.csproj
similarity index 62%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/aiagent-webapi.csproj
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/aiagent-webapi.csproj
index 1070edf0dad..4ee728aaba3 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/aiagent-webapi.csproj
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/aiagent-webapi.csproj
@@ -4,16 +4,16 @@
net10.0enableenable
- secret
+ {00000000-0000-0000-0000-000000000000}
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/appsettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/appsettings.json
similarity index 100%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.GitHubModels.verified/aiagent-webapi/appsettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.o.verified/aiagent-webapi/appsettings.json
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/Program.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/Program.cs
similarity index 92%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/Program.cs
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/Program.cs
index 15009d121cd..efed4c96ad5 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/Program.cs
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/Program.cs
@@ -31,9 +31,12 @@
builder.AddWorkflow("publisher", (sp, key) => AgentWorkflowBuilder.BuildSequential(
workflowName: key,
- sp.GetRequiredKeyedService("writer"),
- sp.GetRequiredKeyedService("editor")
-)).AddAsAIAgent();
+ agents:
+ [
+ sp.GetRequiredKeyedService("writer"),
+ sp.GetRequiredKeyedService("editor")
+ ]
+)).AddAsAIAgent("publisher-agent");
// Register services for OpenAI responses and conversations (also required for DevUI)
builder.Services.AddOpenAIResponses();
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/Properties/launchSettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/Properties/launchSettings.json
new file mode 100644
index 00000000000..d71b1876d35
--- /dev/null
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/Properties/launchSettings.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "https://json.schemastore.org/launchsettings.json",
+ "profiles": {
+ "http": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "launchUrl": "devui/",
+ "applicationUrl": "http://localhost:9996",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "https": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "launchUrl": "devui/",
+ "applicationUrl": "https://localhost:9995;http://localhost:9996",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ }
+ }
+}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/README.md b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/README.md
similarity index 98%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/README.md
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/README.md
index a989e78b7d7..dfd846707b6 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.OpenAI.verified/aiagent-webapi/README.md
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/README.md
@@ -50,8 +50,8 @@ dotnet run -lp https
```
The application will start and listen on:
-- HTTP: `http://localhost:9999`
-- HTTPS: `https://localhost:9999`
+- HTTP: `http://localhost:9996`
+- HTTPS: `https://localhost:9995`
### 3. Test the Application
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/aiagent-webapi.csproj b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/aiagent-webapi.csproj
similarity index 69%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/aiagent-webapi.csproj
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/aiagent-webapi.csproj
index 337bfdd220c..6e5004343c4 100644
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.DefaultParameters.verified/aiagent-webapi/aiagent-webapi.csproj
+++ b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/aiagent-webapi.csproj
@@ -4,16 +4,16 @@
net10.0enableenable
- secret
+ {00000000-0000-0000-0000-000000000000}
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/appsettings.json b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/appsettings.json
similarity index 100%
rename from test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi.Ollama.verified/aiagent-webapi/appsettings.json
rename to test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/Snapshots/aiagent-webapi/aiagent-webapi.oai.verified/aiagent-webapi/appsettings.json
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/WebApiAgentTemplateExecutionTests.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/WebApiAgentTemplateExecutionTests.cs
deleted file mode 100644
index 2462a7bd002..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/WebApiAgentTemplateExecutionTests.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.Shared.ProjectTemplates.Tests;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Microsoft.Agents.AI.ProjectTemplates.Tests;
-
-///
-/// Contains execution tests for the "AI Agent Web API" template.
-///
-///
-/// In addition to validating that the templates build and restore correctly,
-/// these tests are also responsible for template component governance reporting.
-/// This is because the generated output is left on disk after tests complete,
-/// most importantly the project.assets.json file that gets created during restore.
-/// Therefore, it's *critical* that these tests remain in a working state,
-/// as disabling them will also disable CG reporting.
-///
-public class WebApiAgentTemplateExecutionTests : TemplateExecutionTestBase, ITemplateExecutionTestConfigurationProvider
-{
- public WebApiAgentTemplateExecutionTests(TemplateExecutionTestFixture fixture, ITestOutputHelper outputHelper)
- : base(fixture, outputHelper)
- {
- }
-
- public static TemplateExecutionTestConfiguration Configuration { get; } = new()
- {
- TemplatePackageName = "Microsoft.Agents.AI.ProjectTemplates",
- TestOutputFolderPrefix = "WebApiAgent"
- };
-
- public static IEnumerable GetTemplateOptions()
- => GetFilteredTemplateOptions();
-
- // Do not skip. See XML docs for this test class.
- [Theory]
- [MemberData(nameof(GetTemplateOptions))]
- public async Task CreateRestoreAndBuild(params string[] args)
- {
- const string ProjectName = "WebApiAgentApp";
- var project = await Fixture.CreateProjectAsync(
- templateName: "aiagent-webapi",
- projectName: ProjectName,
- args);
-
- await Fixture.RestoreProjectAsync(project);
- await Fixture.BuildProjectAsync(project);
- }
-
- private static readonly (string name, string[] values)[] _templateOptions = [
- ("--provider", ["azureopenai", "githubmodels", "ollama", "openai"]),
- ("--managed-identity", ["true", "false"]),
- ];
-
- private static IEnumerable GetFilteredTemplateOptions(params string[] filter)
- {
- foreach (var options in GetAllPossibleOptions(_templateOptions))
- {
- if (!MatchesFilter())
- {
- continue;
- }
-
- if (HasOption("--managed-identity", "true") && !HasOption("--provider", "azureopenai"))
- {
- // The managed identity option is only valid for Azure OpenAI.
- continue;
- }
-
- yield return options;
-
- bool MatchesFilter()
- {
- for (var i = 0; i < filter.Length; i += 2)
- {
- if (!HasOption(filter[i], filter[i + 1]))
- {
- return false;
- }
- }
-
- return true;
- }
-
- bool HasOption(string name, string value)
- {
- for (var i = 0; i < options.Length; i += 2)
- {
- if (string.Equals(name, options[i], StringComparison.Ordinal) &&
- string.Equals(value, options[i + 1], StringComparison.Ordinal))
- {
- return true;
- }
- }
-
- return false;
- }
- }
- }
-
- private static IEnumerable GetAllPossibleOptions(ReadOnlyMemory<(string name, string[] values)> options)
- {
- if (options.Length == 0)
- {
- yield return [];
- yield break;
- }
-
- var first = options.Span[0];
- foreach (var restSelection in GetAllPossibleOptions(options[1..]))
- {
- foreach (var value in first.values)
- {
- yield return [first.name, value, .. restSelection];
- }
- }
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/WebApiAgentTemplateSnapshotTests.cs b/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/WebApiAgentTemplateSnapshotTests.cs
deleted file mode 100644
index dce7ca19646..00000000000
--- a/test/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates.IntegrationTests/WebApiAgentTemplateSnapshotTests.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Shared.ProjectTemplates.Tests;
-using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
-using Microsoft.TemplateEngine.TestHelper;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Microsoft.Agents.AI.ProjectTemplates.Tests;
-
-public class WebApiAgentTemplateSnapshotTests
-{
- // Keep the exclude patterns below in sync with those in Microsoft.Agents.AI.ProjectTemplates.csproj.
- private static readonly string[] _verificationExcludePatterns = [
- "**/bin/**",
- "**/obj/**",
- "**/.vs/**",
- "**/*.user",
- "**/*.in",
- "**/NuGet.config",
- "**/Directory.Build.targets",
- "**/Directory.Build.props"
- ];
-
- private readonly ILogger _log;
-
- public WebApiAgentTemplateSnapshotTests(ITestOutputHelper log)
- {
-#pragma warning disable CA2000 // Dispose objects before losing scope
- _log = new XunitLoggerProvider(log).CreateLogger("TestRun");
-#pragma warning restore CA2000 // Dispose objects before losing scope
- }
-
- [Fact]
- public async Task DefaultParameters()
- {
- await TestTemplateCoreAsync(scenarioName: nameof(DefaultParameters));
- }
-
- [Fact]
- public async Task GitHubModels()
- {
- await TestTemplateCoreAsync(scenarioName: nameof(GitHubModels), templateArgs: ["--provider", "githubmodels"]);
- }
-
- [Fact]
- public async Task OpenAI()
- {
- await TestTemplateCoreAsync(scenarioName: nameof(OpenAI), templateArgs: ["--provider", "openai"]);
- }
-
- [Fact]
- public async Task AzureOpenAI_ManagedIdentity()
- {
- await TestTemplateCoreAsync(scenarioName: nameof(AzureOpenAI_ManagedIdentity), templateArgs: ["--provider", "azureopenai"]);
- }
-
- [Fact]
- public async Task AzureOpenAI_ApiKey()
- {
- await TestTemplateCoreAsync(scenarioName: nameof(AzureOpenAI_ApiKey), templateArgs: ["--provider", "azureopenai", "--managed-identity", "false"]);
- }
-
- [Fact]
- public async Task Ollama()
- {
- await TestTemplateCoreAsync(scenarioName: nameof(Ollama), templateArgs: ["--provider", "ollama"]);
- }
-
- private async Task TestTemplateCoreAsync(string scenarioName, IEnumerable? templateArgs = null)
- {
- string workingDir = TestUtils.CreateTemporaryFolder();
- string templateShortName = "aiagent-webapi";
-
- // Get the template location
- string templateLocation = Path.Combine(WellKnownPaths.TemplateFeedLocation, "Microsoft.Agents.AI.ProjectTemplates", "src", "WebApiAgent");
-
- var verificationExcludePatterns = Path.DirectorySeparatorChar is '/'
- ? _verificationExcludePatterns
- : _verificationExcludePatterns.Select(p => p.Replace('/', Path.DirectorySeparatorChar)).ToArray();
-
- TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName)
- {
- TemplatePath = templateLocation,
- TemplateSpecificArgs = templateArgs,
- SnapshotsDirectory = "Snapshots",
- OutputDirectory = workingDir,
- DoNotPrependCallerMethodNameToScenarioName = true,
- DoNotAppendTemplateArgsToScenarioName = true,
- ScenarioName = scenarioName,
- VerificationExcludePatterns = verificationExcludePatterns,
- }
- .WithCustomScrubbers(
- ScrubbersDefinition.Empty.AddScrubber((path, content) =>
- {
- string filePath = path.UnixifyDirSeparators();
- if (filePath.EndsWith(".sln"))
- {
- // Scrub .sln file GUIDs.
- content.ScrubByRegex(pattern: @"\{.{36}\}", replacement: "{00000000-0000-0000-0000-000000000000}");
- }
-
- if (filePath.EndsWith(".csproj"))
- {
- content.ScrubByRegex("(.*)<\\/UserSecretsId>", "secret");
-
- // Scrub references to just-built packages and remove the suffix, if it exists.
- // This allows the snapshots to remain the same regardless of where the repo is built (e.g., locally, public CI, internal CI).
- var pattern = @"(?<=)";
- content.ScrubByRegex(pattern, replacement: "$2");
- }
-
- if (filePath.EndsWith("launchSettings.json") || filePath.EndsWith("README.md"))
- {
- content.ScrubByRegex("(http(s?):\\/\\/localhost)\\:(\\d*)", "$1:9999");
- }
- }));
-
- VerificationEngine engine = new VerificationEngine(_log);
- await engine.Execute(options);
-
-#pragma warning disable CA1031 // Do not catch general exception types
- try
- {
- Directory.Delete(workingDir, recursive: true);
- }
- catch
- {
- /* don't care */
- }
-#pragma warning restore CA1031 // Do not catch general exception types
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebExecutionTests.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebExecutionTests.cs
index 1f82e25f135..513f4cf0394 100644
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebExecutionTests.cs
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebExecutionTests.cs
@@ -1,13 +1,13 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.Shared.ProjectTemplates.Tests;
using Microsoft.TestUtilities;
using Xunit;
using Xunit.Abstractions;
+using static Microsoft.Shared.ProjectTemplates.Tests.TemplateTestUtilities;
namespace Microsoft.Extensions.AI.Templates.Tests;
@@ -32,193 +32,91 @@ public AIChatWebExecutionTests(TemplateExecutionTestFixture fixture, ITestOutput
public static TemplateExecutionTestConfiguration Configuration { get; } = new()
{
TemplatePackageName = "Microsoft.Extensions.AI.Templates",
- TestOutputFolderPrefix = "AIChatWeb"
+ TemplateName = "aichatweb"
};
- public static IEnumerable GetBasicTemplateOptions()
- => GetFilteredTemplateOptions("--aspire", "false");
+ public static IEnumerable GetSupportedProjectConfigurations()
+ {
+ (string name, string[] values)[] allOptionValues = [
+ ("--provider", ["azureopenai", "githubmodels", "ollama", "openai" /*, "azureaifoundry" */]),
+ ("--vector-store", ["azureaisearch", "local", "qdrant"]),
+ ("--aspire", ["true", "false"]),
+ ("--managed-identity", ["true", "false"]),
+ ("--Framework", ["net9.0", "net10.0"])
+ ];
+
+ foreach (var args in GetPossibleOptions(allOptionValues))
+ {
+ // Managed Identity only applies when using an Azure service and not using aspire
+ if (HasOption(args, "--managed-identity"))
+ {
+ if (HasOption(args, "--aspire"))
+ {
+ continue;
+ }
- public static IEnumerable GetAspireTemplateOptions()
- => GetFilteredTemplateOptions("--aspire", "true");
+ if (!HasOption(args, "--provider", "azureopenai") &&
+ !HasOption(args, "--provider", "azureaifoundry") &&
+ !HasOption(args, "--vector-store", "azureaisearch"))
+ {
+ continue;
+ }
+ }
- // Do not skip. See XML docs for this test class.
- [Theory]
- [MemberData(nameof(GetBasicTemplateOptions))]
- public async Task CreateRestoreAndBuild_BasicTemplate(params string[] args)
- {
- const string ProjectName = "BasicApp";
- var project = await Fixture.CreateProjectAsync(
- templateName: "aichatweb",
- projectName: ProjectName,
- args);
+ // Qdrant requires using Aspire orchestration
+ if (HasOption(args, "--vector-store", "qdrant") && !HasOption(args, "--aspire"))
+ {
+ continue;
+ }
- await Fixture.RestoreProjectAsync(project);
- await Fixture.BuildProjectAsync(project);
+ yield return args;
+ }
}
// Do not skip. See XML docs for this test class.
[Theory]
- [MemberData(nameof(GetAspireTemplateOptions))]
- public async Task CreateRestoreAndBuild_AspireTemplate(params string[] args)
+ [MemberData(nameof(GetSupportedProjectConfigurations))]
+ public async Task TestAllSupportedConfigurations(params string[] args)
{
- const string ProjectName = "AspireApp";
- var project = await Fixture.CreateProjectAsync(
- templateName: "aichatweb",
- ProjectName,
- args);
+ string projectName = GetProjectNameForArgs(args, prefix: "AIChatWeb");
+ string? startupProjectRelativePath = HasOption(args, "--aspire") ? $"{projectName}.AppHost" : null;
- project.StartupProjectRelativePath = $"{ProjectName}.AppHost";
-
- await Fixture.RestoreProjectAsync(project);
- await Fixture.BuildProjectAsync(project);
+ await CreateRestoreAndBuild(projectName, args, startupProjectRelativePath);
}
///
- /// Runs a single test with --aspire true and a project name that will trigger the class
- /// name normalization bug reported in https://github.com/dotnet/extensions/issues/6811.
+ /// Runs a single test with --aspire and a project name that will trigger the class name
+ /// normalization bug reported in https://github.com/dotnet/extensions/issues/6811.
///
[Fact]
public async Task CreateRestoreAndBuild_AspireProjectName()
{
- await CreateRestoreAndBuild_AspireProjectName_Variants("azureopenai", "mix.ed-dash_name 123");
+ await CreateRestoreAndBuild("mix.ed-dash_name 123", ["--aspire", "--provider", "azureopenai"]);
}
///
/// Tests build for various project name formats, including dots and other
/// separators, to trigger the class name normalization bug described
/// in https://github.com/dotnet/extensions/issues/6811
- /// This runs for all provider combinations with --aspire true and different
- /// project names to ensure the bug is caught in all scenarios.
///
///
- /// Because this test takes a long time to run, it is skipped by default. Set the
- /// environment variable AI_TEMPLATES_TEST_PROJECT_NAMES to "true" or "1"
+ /// Because this test takes a few minutes to run and is only needed for regression
+ /// testing of project name handing integration with Aspire, it is skipped by default.
+ /// Set the environment variable AI_TEMPLATES_TEST_PROJECT_NAMES to "true" or "1"
/// to enable it.
///
[ConditionalTheory]
[EnvironmentVariableCondition("AI_TEMPLATES_TEST_PROJECT_NAMES", "true", "1")]
- [MemberData(nameof(GetAspireProjectNameVariants))]
- public async Task CreateRestoreAndBuild_AspireProjectName_Variants(string provider, string projectName)
- {
- var project = await Fixture.CreateProjectAsync(
- templateName: "aichatweb",
- projectName: projectName,
- args: new[] { "--aspire", $"--provider={provider}" });
-
- project.StartupProjectRelativePath = $"{projectName}.AppHost";
-
- await Fixture.RestoreProjectAsync(project);
- await Fixture.BuildProjectAsync(project);
- }
-
- private static readonly (string name, string[] values)[] _templateOptions = [
- ("--provider", ["azureopenai", "githubmodels", "ollama", "openai"]),
- ("--vector-store", ["azureaisearch", "local", "qdrant"]),
- ("--managed-identity", ["true", "false"]),
- ("--aspire", ["true", "false"]),
- ("--Framework", ["net9.0", "net10.0"])
- ];
-
- private static IEnumerable GetFilteredTemplateOptions(params string[] filter)
- {
- foreach (var options in GetAllPossibleOptions(_templateOptions))
- {
- if (!MatchesFilter())
- {
- continue;
- }
-
- if (HasOption("--managed-identity", "true"))
- {
- if (HasOption("--aspire", "true"))
- {
- // The managed identity option is disabled for the Aspire template.
- continue;
- }
-
- if (!HasOption("--vector-store", "azureaisearch") &&
- !HasOption("--aspire", "false"))
- {
- // Can only use managed identity when using Azure in the non-Aspire template.
- continue;
- }
- }
-
- if (HasOption("--vector-store", "qdrant") &&
- HasOption("--aspire", "false"))
- {
- // Can't use Qdrant without Aspire.
- continue;
- }
-
- yield return options;
-
- bool MatchesFilter()
- {
- for (var i = 0; i < filter.Length; i += 2)
- {
- if (!HasOption(filter[i], filter[i + 1]))
- {
- return false;
- }
- }
-
- return true;
- }
-
- bool HasOption(string name, string value)
- {
- for (var i = 0; i < options.Length; i += 2)
- {
- if (string.Equals(name, options[i], StringComparison.Ordinal) &&
- string.Equals(value, options[i + 1], StringComparison.Ordinal))
- {
- return true;
- }
- }
-
- return false;
- }
- }
- }
-
- private static IEnumerable GetAllPossibleOptions(ReadOnlyMemory<(string name, string[] values)> options)
- {
- if (options.Length == 0)
- {
- yield return [];
- yield break;
- }
-
- var first = options.Span[0];
- foreach (var restSelection in GetAllPossibleOptions(options[1..]))
- {
- foreach (var value in first.values)
- {
- yield return [first.name, value, .. restSelection];
- }
- }
- }
-
- public static IEnumerable GetAspireProjectNameVariants()
+ [InlineData("dot.name")]
+ [InlineData("project.123")]
+ [InlineData("space name")]
+ [InlineData(".1My.Projec-")]
+ [InlineData("1Project123")]
+ [InlineData("11double")]
+ [InlineData("1")]
+ [InlineData("nomatch")]
+ public async Task CreateRestoreAndBuild_AspireProjectName_Variants(string projectName)
{
- foreach (string provider in new[] { "ollama", "openai", "azureopenai", "githubmodels" })
- {
- foreach (string projectName in new[]
- {
- "mix.ed-dash_name 123",
- "dot.name",
- "project.123",
- "space name",
- ".1My.Projec-",
- "1Project123",
- "11double",
- "1",
- "nomatch"
- })
- {
- yield return new object[] { provider, projectName };
- }
- }
+ await CreateRestoreAndBuild(projectName, ["--aspire", "--provider", "azureopenai"]);
}
}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebSnapshotTests.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebSnapshotTests.cs
index 487d83834a4..dbe71cdbdef 100644
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebSnapshotTests.cs
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/AIChatWebSnapshotTests.cs
@@ -1,9 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Shared.ProjectTemplates.Tests;
@@ -11,26 +8,15 @@
using Microsoft.TemplateEngine.TestHelper;
using Xunit;
using Xunit.Abstractions;
+using static Microsoft.Shared.ProjectTemplates.Tests.TemplateTestUtilities;
namespace Microsoft.Extensions.AI.Templates.Tests;
-public class AIChatWebSnapshotTests
+public class AIChatWebSnapshotTests : TemplateSnapshotTestBase
{
- // Keep the exclude patterns below in sync with those in Microsoft.Extensions.AI.Templates.csproj.
+ // The wwwroot folder contains static content
private static readonly string[] _verificationExcludePatterns = [
- "**/bin/**",
- "**/obj/**",
- "**/.vs/**",
- "**/node_modules/**",
- "**/*.user",
- "**/*.in",
- "**/*.out.js",
- "**/*.generated.css",
- "**/package-lock.json",
- "**/ingestioncache.*",
- "**/NuGet.config",
- "**/Directory.Build.targets",
- "**/Directory.Build.props",
+ "**/wwwroot/**"
];
private readonly ILogger _log;
@@ -42,97 +28,31 @@ public AIChatWebSnapshotTests(ITestOutputHelper log)
#pragma warning restore CA2000 // Dispose objects before losing scope
}
- [Fact]
- public async Task BasicTest()
+ [Theory]
+ [InlineData /* Defaults: --provider=githubmodels --vector-store=local */]
+ [InlineData("--provider=ollama", "--vector-store=qdrant")]
+ [InlineData("--provider=openai", "--vector-store=azureaisearch")]
+ [InlineData("--aspire")]
+ [InlineData("--aspire", "--provider=azureopenai", "--vector-store=azureaisearch")]
+ public async Task RunSnapshotTests(params string[] templateArgs)
{
- await TestTemplateCoreAsync(scenarioName: "Basic");
- }
-
- [Fact]
- public async Task Ollama_Qdrant()
- {
- await TestTemplateCoreAsync(scenarioName: "Ollama_Qdrant", templateArgs: ["--provider", "ollama", "--vector-store", "qdrant"]);
- }
-
- [Fact]
- public async Task OpenAI_AzureAISearch()
- {
- await TestTemplateCoreAsync(scenarioName: "OpenAI_AzureAISearch", templateArgs: ["--provider", "openai", "--vector-store", "azureaisearch"]);
- }
-
- [Fact]
- public async Task BasicAspireTest()
- {
- await TestTemplateCoreAsync(scenarioName: "BasicAspire", templateArgs: ["--aspire"]);
- }
-
- [Fact]
- public async Task AzureOpenAI_AzureAISearch_Aspire()
- {
- await TestTemplateCoreAsync(scenarioName: "AzureOpenAI_Qdrant_Aspire", templateArgs: ["--provider", "azureopenai", "--vector-store", "azureaisearch", "--aspire"]);
- }
-
- private async Task TestTemplateCoreAsync(string scenarioName, IEnumerable? templateArgs = null)
- {
- string workingDir = TestUtils.CreateTemporaryFolder();
- string templateShortName = "aichatweb";
-
- // Get the template location
- string templateLocation = Path.Combine(WellKnownPaths.TemplateFeedLocation, "Microsoft.Extensions.AI.Templates", "src", "ChatWithCustomData");
-
- var verificationExcludePatterns = Path.DirectorySeparatorChar is '/'
- ? _verificationExcludePatterns
- : _verificationExcludePatterns.Select(p => p.Replace('/', Path.DirectorySeparatorChar)).ToArray();
-
- TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName)
- {
- TemplatePath = templateLocation,
- TemplateSpecificArgs = templateArgs,
- SnapshotsDirectory = "Snapshots",
- OutputDirectory = workingDir,
- DoNotPrependCallerMethodNameToScenarioName = true,
- DoNotAppendTemplateArgsToScenarioName = true,
- ScenarioName = scenarioName,
- VerificationExcludePatterns = verificationExcludePatterns,
- }
- .WithCustomScrubbers(
- ScrubbersDefinition.Empty.AddScrubber((path, content) =>
- {
- string filePath = path.UnixifyDirSeparators();
- if (filePath.EndsWith(".sln"))
- {
- // Scrub .sln file GUIDs.
- content.ScrubByRegex(pattern: @"\{.{36}\}", replacement: "{00000000-0000-0000-0000-000000000000}");
- }
-
- if (filePath.EndsWith(".csproj"))
- {
- content.ScrubByRegex("(.*)<\\/UserSecretsId>", "secret");
-
- // Scrub references to just-built packages and remove the suffix, if it exists.
- // This allows the snapshots to remain the same regardless of where the repo is built (e.g., locally, public CI, internal CI).
- var pattern = @"(?<=)";
- content.ScrubByRegex(pattern, replacement: "$1");
- }
-
- if (filePath.EndsWith("launchSettings.json"))
- {
- content.ScrubByRegex("(http(s?):\\/\\/localhost)\\:(\\d*)", "$1:9999");
- }
- }));
+ string projectNamePrefix = "AIChatWeb";
+ string templatePackageName = "Microsoft.Extensions.AI.Templates";
+ string templateName = "aichatweb";
+
+ TemplateVerifierOptions options = PrepareSnapshotVerifier(
+ projectNamePrefix,
+ templatePackageName,
+ templateName,
+ templateArgs,
+ _verificationExcludePatterns)
+ .WithCustomScrubbers(ScrubbersDefinition.Empty
+ .AddSolutionFileGuidScrubber()
+ .AddUserSecretsScrubber()
+ .AddPackageReferenceScrubber()
+ .AddLocalhostPortScrubber());
VerificationEngine engine = new VerificationEngine(_log);
await engine.Execute(options);
-
-#pragma warning disable CA1031 // Do not catch general exception types
- try
- {
- Directory.Delete(workingDir, recursive: true);
- }
- catch
- {
- /* don't care */
- }
-#pragma warning restore CA1031 // Do not catch general exception types
}
}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs
deleted file mode 100644
index ccfce67367a..00000000000
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/McpServerSnapshotTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Shared.ProjectTemplates.Tests;
-using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
-using Microsoft.TemplateEngine.TestHelper;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Microsoft.Extensions.AI.Templates.Tests;
-
-public class McpServerSnapshotTests
-{
- // Keep the exclude patterns below in sync with those in Microsoft.Extensions.AI.Templates.csproj.
- private static readonly string[] _verificationExcludePatterns = [
- "**/bin/**",
- "**/obj/**",
- "**/.vs/**",
- "**/*.sln",
- "**/*.in",
- ];
-
- private readonly ILogger _log;
-
- public McpServerSnapshotTests(ITestOutputHelper log)
- {
-#pragma warning disable CA2000 // Dispose objects before losing scope
- _log = new XunitLoggerProvider(log).CreateLogger("TestRun");
-#pragma warning restore CA2000 // Dispose objects before losing scope
- }
-
- [Fact]
- public async Task BasicTest()
- {
- await TestTemplateCoreAsync(scenarioName: "Basic");
- }
-
- [Fact]
- public async Task SelfContainedFalse()
- {
- await TestTemplateCoreAsync(scenarioName: "SelfContainedFalse", templateArgs: ["--self-contained", bool.FalseString]);
- }
-
- [Fact]
- public async Task AotTrue()
- {
- await TestTemplateCoreAsync(scenarioName: "AotTrue", templateArgs: ["--aot", bool.TrueString]);
- }
-
- [Fact]
- public async Task Net10()
- {
- await TestTemplateCoreAsync(scenarioName: "net10", templateArgs: ["--framework", "net10.0"]);
- }
-
- private async Task TestTemplateCoreAsync(string scenarioName, IEnumerable? templateArgs = null)
- {
- string workingDir = TestUtils.CreateTemporaryFolder();
- string templateShortName = "mcpserver";
-
- // Get the template location
- string templateLocation = Path.Combine(WellKnownPaths.TemplateFeedLocation, "Microsoft.Extensions.AI.Templates", "src", "McpServer");
-
- var verificationExcludePatterns = Path.DirectorySeparatorChar is '/'
- ? _verificationExcludePatterns
- : _verificationExcludePatterns.Select(p => p.Replace('/', Path.DirectorySeparatorChar)).ToArray();
-
- TemplateVerifierOptions options = new TemplateVerifierOptions(templateName: templateShortName)
- {
- TemplatePath = templateLocation,
- TemplateSpecificArgs = templateArgs,
- SnapshotsDirectory = "Snapshots",
- OutputDirectory = workingDir,
- DoNotPrependCallerMethodNameToScenarioName = true,
- DoNotAppendTemplateArgsToScenarioName = true,
- ScenarioName = scenarioName,
- VerificationExcludePatterns = verificationExcludePatterns,
- }
- .WithCustomScrubbers(
- ScrubbersDefinition.Empty.AddScrubber((path, content) =>
- {
- string filePath = path.UnixifyDirSeparators();
-
- if (filePath.EndsWith(".csproj"))
- {
- // Scrub references to just-built packages and remove the suffix, if it exists.
- // This allows the snapshots to remain the same regardless of where the repo is built (e.g., locally, public CI, internal CI).
- var pattern = @"(?<=)";
- content.ScrubByRegex(pattern, replacement: "$1");
- }
- }));
-
- VerificationEngine engine = new VerificationEngine(_log);
- await engine.Execute(options);
-
-#pragma warning disable CA1031 // Do not catch general exception types
- try
- {
- Directory.Delete(workingDir, recursive: true);
- }
- catch
- {
- /* don't care */
- }
-#pragma warning restore CA1031 // Do not catch general exception types
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Microsoft.Extensions.AI.Templates.Tests.csproj b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Microsoft.Extensions.AI.Templates.Tests.csproj
index bd83d4fa93e..93e7ab12b63 100644
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Microsoft.Extensions.AI.Templates.Tests.csproj
+++ b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Microsoft.Extensions.AI.Templates.Tests.csproj
@@ -25,9 +25,6 @@
-
-
-
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/ProjectRootHelper.cs b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/ProjectRootHelper.cs
deleted file mode 100644
index 97be1100c35..00000000000
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/ProjectRootHelper.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.IO;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Shared.ProjectTemplates.Tests;
-
-///
-/// Contains a helper for determining the disk location of the containing project folder.
-///
-///
-/// It's important that this file resides in the root of the containing project, or the returned
-/// project root path will be incorrect.
-///
-internal static class ProjectRootHelper
-{
- public static string GetThisProjectRoot()
- => GetThisProjectRootCore();
-
- // This helper method is defined separately from its public variant because it extracts the
- // caller file path via the [CallerFilePath] attribute.
- // Therefore, the caller must be in a known location, i.e., this source file, to produce
- // a reliable result.
- private static string GetThisProjectRootCore([CallerFilePath] string callerFilePath = "")
- {
- if (Path.GetDirectoryName(callerFilePath) is not { Length: > 0 } testProjectRoot)
- {
- throw new InvalidOperationException("Could not determine the root of the test project.");
- }
-
- return testProjectRoot;
- }
-}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf
deleted file mode 100644
index 94625f0e0e0..00000000000
Binary files a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/Data/Example_Emergency_Survival_Kit.pdf and /dev/null differ
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/Data/Example_GPS_Watch.md b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/Data/Example_GPS_Watch.md
deleted file mode 100644
index f7d042edf83..00000000000
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/Data/Example_GPS_Watch.md
+++ /dev/null
@@ -1,193 +0,0 @@
-# TrailMaster GPS Watch
-
-## 1. Introduction
-
-ExpeditionTech is proud to introduce the TrailMaster GPS Watch, a state-of-the-art outdoor electronics device designed for the most demanding outdoor adventurers. This watch is meticulously engineered to provide accurate location information, real-time sharing, and reliable mapping capabilities. The TrailMaster GPS Watch is built to withstand the harshest environmental conditions while providing users with the critical data they need to navigate through challenging terrain and optimize their outdoor experiences.
-
-### 1.1 Product Overview
-
-The TrailMaster GPS Watch is a high-performance outdoor electronics device that combines advanced GPS technology with rugged design. It features a durable, shock-resistant casing, a high-contrast display for optimal visibility in bright sunlight, and a built-in rechargeable battery for extended use in remote areas. The TrailMaster GPS Watch is equipped with a comprehensive suite of navigation tools, including topographic maps, trail tracking, and waypoint management. Additionally, it offers real-time location sharing for enhanced safety and group coordination during outdoor activities.
-
-### 1.2 Intended Use
-
-The TrailMaster GPS Watch is intended for use by experienced outdoor enthusiasts, including hikers, backpackers, trail runners, and mountaineers. This device is designed to provide essential navigation information and location tracking in remote, off-grid environments. Users can rely on the TrailMaster GPS Watch to plan and execute their outdoor adventures with confidence, knowing they have access to accurate maps, location data, and real-time sharing capabilities. Although the TrailMaster GPS Watch is engineered for extreme durability, users should always exercise caution and take appropriate safety measures when engaging in outdoor activities.
-
-#### 1.2.1 Safety Precautions
-
-Before using the TrailMaster GPS Watch, users must ensure that the device is fully charged and properly calibrated according to the manufacturer's specifications. It is essential to familiarize oneself with the watch's features, controls, and navigation functions before venturing into remote outdoor areas. Users should also be aware of potential environmental hazards, such as extreme weather conditions, rugged terrain, and limited access to emergency services. Proper planning, preparation, and adherence to best practices for outdoor safety are critical when using the TrailMaster GPS Watch.
-
-## 2. Technical Specifications
-
-### 2.1 Hardware
-
-#### 2.1.1 Processor and Memory
-
-The TrailMaster GPS Watch is equipped with a high-performance ARM Cortex processor, ensuring fast and efficient operation for all your outdoor activities. The device also comes with 4GB of internal memory, providing ample storage for maps, routes, and waypoints. The processor operates at 1.2GHz, allowing for quick map rendering and location updates.
-
-#### 2.1.2 GPS Module
-
-The GPS module in the TrailMaster GPS Watch utilizes a state-of-the-art multi-constellation receiver, supporting GPS, GLONASS, and Galileo satellite systems. This enables precise location tracking and navigation, even in challenging outdoor environments. The module also features advanced signal processing algorithms, ensuring reliable performance in remote areas with limited satellite visibility.
-
-#### 2.1.3 Sensors
-
-Equipped with a comprehensive set of sensors, the TrailMaster GPS Watch offers an array of valuable data for outdoor enthusiasts. The built-in altimeter provides accurate altitude readings, while the barometer monitors changes in air pressure to forecast weather conditions. Additionally, the watch includes a digital compass for reliable orientation, ensuring a seamless navigation experience in the great outdoors.
-
-### 2.2 Software
-
-#### 2.2.1 Operating System
-
-The TrailMaster GPS Watch runs on a proprietary operating system optimized for outdoor navigation and tracking. This custom OS combines robustness and efficiency, allowing for seamless integration with the device's hardware and sensors. The interface is designed for intuitive interaction, enabling users to access maps, location sharing, and other features with ease, even in challenging outdoor conditions.
-
-#### 2.2.2 Map Data
-
-The TrailMaster GPS Watch comes preloaded with detailed topographic maps, providing comprehensive coverage of trails, terrain, and points of interest. These maps are stored locally on the device, ensuring rapid access and smooth navigation without relying on cellular or data network connectivity. Users can also import additional map data via the dedicated USB port, expanding the watch's mapping capabilities for customized adventures.
-
-## 3. Setup and Installation
-
-### 3.1 Charging
-
-Before using your TrailMaster GPS Watch for the first time, it is essential to ensure that the device is fully charged. To charge your GPS watch, follow these steps:
-
-1. Locate the charging port cover on the back of the watch.
-2. Gently lift the cover to expose the charging port.
-3. Connect the provided USB charging cable to the port, ensuring a secure connection.
-4. Plug the other end of the cable into a power source, such as a computer or USB wall adapter.
-5. Allow the watch to charge for at least 2 hours, or until the battery indicator on the display shows it is fully charged.
-
-For optimal performance, it is recommended to fully charge the device before each use and to avoid overcharging. Please refer to the TrailMaster GPS Watch technical specifications for detailed battery charging information.
-
-### 3.2 Initial Configuration
-
-Once your TrailMaster GPS Watch is fully charged, you can proceed with the initial configuration by following these steps:
-
-1. Press and hold the power button located on the side of the watch to turn it on.
-2. Follow the on-screen instructions to select your language, set the date and time, and calibrate the GPS.
-3. Connect the watch to your smartphone using the TrailMaster companion app to enable real-time location sharing and receive notifications.
-4. Customize the watch settings, such as display preferences and map views, to suit your outdoor activities.
-
-Before using the GPS functionality, it is crucial to ensure that the watch has a clear view of the sky to acquire GPS signals. Please refer to the TrailMaster GPS Watch user guide for detailed instructions on GPS calibration and satellite acquisition.
-
-## 4. Operation
-
-### 4.1 Basic Functions
-
-The TrailMaster GPS Watch is designed for outdoor use and offers a variety of basic functions to assist users in navigating and staying connected during their adventures.
-
-#### 4.1.1 Powering On and Off
-
-To power on the TrailMaster GPS Watch, press and hold the power button (located on the right side of the watch) for 3 seconds. The watch will display the ExpeditionTech logo and then proceed to the main navigation screen. To power off the watch, press and hold the power button and select "Power Off" from the menu.
-
-#### 4.1.2 Accessing Built-in Maps
-
-The TrailMaster GPS Watch comes pre-loaded with detailed maps of various outdoor locations. To access the maps, press the map button (located on the left side of the watch) to bring up the map interface. From here, you can view your current location, set waypoints, and plan routes.
-
-#### 4.1.3 Real-time Location Sharing
-
-Utilize the real-time location sharing feature to transmit your current location to designated contacts. Press the share button (located on the top of the watch) and select the specific contacts you wish to share your location with. This feature requires a stable GPS signal and a connected smartphone with the TrailMaster app installed.
-
-### 4.2 Advanced Features
-
-The TrailMaster GPS Watch offers advanced features to enhance the user experience and provide additional functionality for outdoor enthusiasts.
-
-#### 4.2.1 Rugged Design
-
-The TrailMaster GPS Watch is built to withstand rugged outdoor conditions, including extreme temperatures, water exposure, and impact. The durable casing and reinforced strap ensure that the watch remains operational in challenging environments.
-
-#### 4.2.2 Navigation Tools
-
-In addition to basic map access, the TrailMaster GPS Watch includes advanced navigation tools such as compass, altimeter, and barometer. These tools provide vital information for navigation and weather monitoring while in the field.
-
-#### 4.2.3 Customizing Data Screens
-
-Users can customize the data screens on the TrailMaster GPS Watch to display the specific information they require during their outdoor activities. From the main menu, navigate to the settings and select "Data Screens" to adjust the layout and content of the screens.
-
-#### 4.2.4 Tracking Performance Metrics
-
-The TrailMaster GPS Watch is equipped with sensors to track performance metrics such as distance traveled, speed, elevation gain, and heart rate. Use the tracking mode to monitor these metrics in real-time or review them after completing an activity.
-
-## 5. Troubleshooting
-
-### 5.1 Diagnostic Tools and Equipment
-
-When troubleshooting the TrailMaster GPS Watch, it is essential to use specialized industrial diagnostic tools and equipment to perform accurate diagnostic tests. These tools and equipment include:
-
-- **GPS Signal Analyzer**: Use a GPS signal analyzer to check the strength and quality of the satellite signals received by the watch.
-- **RF Spectrum Analyzer**: An RF spectrum analyzer is required to analyze the radio frequency spectrum and identify any interference affecting the GPS reception.
-- **Ruggedness Test Equipment**: Perform ruggedness tests using shock and vibration equipment to ensure the watch can withstand outdoor adventures without performance issues.
-
-It is essential to use these specialized tools and equipment to accurately diagnose any issues with the TrailMaster GPS Watch and ensure optimal performance.
-
-### 5.2 Common Issues
-
-#### 5.2.1 GPS Signal Loss
-
-**Symptoms:**
-
-The watch displays "No GPS Signal" or intermittently loses GPS signal during use.
-
-**Potential Causes:**
-
-- Obstruction of satellite signals due to dense foliage, tall buildings, or natural terrain features.
-- Radio frequency interference affecting GPS reception.
-- Wear and tear on the GPS antenna or receiver.
-
-**Troubleshooting Steps:**
-
-1. Check the surroundings for any obstructions blocking satellite signals.
-2. Use an RF spectrum analyzer to identify any potential sources of interference.
-3. Perform a diagnostics test using a GPS signal analyzer to assess the strength and quality of the GPS signal received by the watch.
-4. If the issue persists, contact ExpeditionTech customer support for further assistance.
-
-#### 5.2.2 Connectivity Issues
-
-**Symptoms:**
-
-- Inability to share real-time location or connect to other devices.
-- Unreliable Bluetooth connectivity.
-
-**Potential Causes:**
-
-- Bluetooth interference from other electronic devices.
-- Signal obstruction due to environmental factors.
-- Software or firmware issues.
-
-**Troubleshooting Steps:**
-
-1. Ensure the watch is within the recommended Bluetooth range of the connected device.
-2. Identify and eliminate potential sources of Bluetooth interference in the vicinity.
-3. Update the watch's firmware to the latest version to address any software-related connectivity issues.
-4. If connectivity problems persist, perform a comprehensive diagnostics test using a specialized Bluetooth signal analyzer.
-
-By following these troubleshooting steps and using specialized diagnostic tools and equipment, users can effectively identify and address common issues with the TrailMaster GPS Watch.
-
-## 6. Maintenance and Care
-
-### 6.1 Cleaning
-
-It is important to regularly clean your TrailMaster GPS Watch to ensure optimal performance. Use a soft, damp cloth to gently wipe the watch face and straps. Do not use harsh chemicals or solvents, as these may damage the watch's rugged design and built-in maps.
-
-### 6.2 Battery Maintenance
-
-The TrailMaster GPS Watch is equipped with a rechargeable lithium-ion battery. To optimize battery life, it is recommended to fully charge the watch before each outdoor adventure. Additionally, it is important to avoid exposing the watch to extreme temperatures, as this may affect battery performance.
-
-### 6.3 Storage
-
-When not in use, store your TrailMaster GPS Watch in a cool, dry place. Avoid prolonged exposure to direct sunlight or extreme temperatures, as this may cause damage to the device.
-
-### 6.4 Software Updates
-
-To ensure that your TrailMaster GPS Watch operates efficiently, it is important to regularly check for and install software updates. These updates may include improvements to the built-in maps, real-time location sharing, and overall performance of the watch.
-
-### 6.5 Technical Diagnostics
-
-For advanced maintenance and care, it is recommended to perform technical diagnostics using specialized industrial and scientific equipment. Refer to formal industry specification codes and standards bodies for detailed instructions on performing these diagnostics.
-
-## 7. Regulatory Compliance
-
-### 7.1 FCC Compliance
-
-The ExpeditionTech TrailMaster GPS Watch complies with Part 15 of the FCC rules. Operation is subject to the following two conditions: (1) this device may not cause harmful interference, and (2) this device must accept any interference received, including interference that may cause undesired operation. Any changes or modifications not expressly approved by the party responsible for compliance could void the user's authority to operate the equipment. The user is cautioned that any changes or modifications made to this device that are not expressly approved by the manufacturer could void the user's authority to operate the equipment.
-
-### 7.2 CE Marking
-
-The CE marking on the ExpeditionTech TrailMaster GPS Watch indicates that it complies with the essential requirements of the relevant European health, safety, and environmental protection legislation. The device is in conformity with the essential requirements and other relevant provisions of Directive 1999/5/EC. The CE marking is affixed to the device to demonstrate that it meets the essential requirements for safety, health, and environmental protection. The user should only use the device in accordance with the instructions provided in the user manual.
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/app.css b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/app.css
deleted file mode 100644
index 0dec580e2fd..00000000000
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/app.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@import url('lib/tailwindcss/dist/preflight.css');
-
-html {
- min-height: 100vh;
-}
-
-html, .main-background-gradient {
- background: linear-gradient(to bottom, rgb(225 227 233), #f4f4f4 25rem);
-}
-
-body {
- display: flex;
- flex-direction: column;
- min-height: 100vh;
-}
-
- html::after {
- content: '';
- background-image: linear-gradient(to right, #3a4ed5, #3acfd5 15%, #d53abf 85%, red);
- width: 100%;
- height: 2px;
- position: fixed;
- top: 0;
- }
-
-h1 {
- font-size: 2.25rem;
- line-height: 2.5rem;
- font-weight: 600;
-}
-
-h1:focus {
- outline: none;
-}
-
-.valid.modified:not([type=checkbox]) {
- outline: 1px solid #26b050;
-}
-
-.invalid {
- outline: 1px solid #e50000;
-}
-
-.validation-message {
- color: #e50000;
-}
-
-.blazor-error-boundary {
- background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
- padding: 1rem 1rem 1rem 3.7rem;
- color: white;
-}
-
- .blazor-error-boundary::after {
- content: "An error has occurred."
- }
-
-.btn-default {
- display: flex;
- padding: 0.25rem 0.75rem;
- gap: 0.25rem;
- align-items: center;
- border-radius: 0.25rem;
- border: 1px solid #9CA3AF;
- font-size: 0.875rem;
- line-height: 1.25rem;
- font-weight: 600;
- background-color: #D1D5DB;
-}
-
- .btn-default:hover {
- background-color: #E5E7EB;
- }
-
-.btn-subtle {
- display: flex;
- padding: 0.25rem 0.75rem;
- gap: 0.25rem;
- align-items: center;
- border-radius: 0.25rem;
- border: 1px solid #D1D5DB;
- font-size: 0.875rem;
- line-height: 1.25rem;
-}
-
- .btn-subtle:hover {
- border-color: #93C5FD;
- background-color: #DBEAFE;
- }
-
-.page-width {
- max-width: 1024px;
- margin: auto;
-}
diff --git a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/app.js b/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/app.js
deleted file mode 100644
index 8b2cecd007d..00000000000
--- a/test/ProjectTemplates/Microsoft.Extensions.AI.Templates.IntegrationTests/Snapshots/aichatweb.AzureOpenAI_Qdrant_Aspire.verified/aichatweb/aichatweb.Web/wwwroot/app.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import DOMPurify from './lib/dompurify/dist/purify.es.mjs';
-import * as marked from './lib/marked/dist/marked.esm.js';
-
-const purify = DOMPurify(window);
-
-customElements.define('assistant-message', class extends HTMLElement {
- static observedAttributes = ['markdown'];
-
- attributeChangedCallback(name, oldValue, newValue) {
- if (name === 'markdown') {
- newValue = newValue.replace(//gs, '');
- const elements = marked.parse(newValue.replace(/ 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
- args[_key - 1] = arguments[_key];
- }
- return apply(func, thisArg, args);
- };
-}
-/**
- * Creates a new function that constructs an instance of the given constructor function with the provided arguments.
- *
- * @param func - The constructor function to be wrapped and called.
- * @returns A new function that constructs an instance of the given constructor function with the provided arguments.
- */
-function unconstruct(func) {
- return function () {
- for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
- args[_key2] = arguments[_key2];
- }
- return construct(func, args);
- };
-}
-/**
- * Add properties to a lookup table
- *
- * @param set - The set to which elements will be added.
- * @param array - The array containing elements to be added to the set.
- * @param transformCaseFunc - An optional function to transform the case of each element before adding to the set.
- * @returns The modified set with added elements.
- */
-function addToSet(set, array) {
- let transformCaseFunc = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : stringToLowerCase;
- if (setPrototypeOf) {
- // Make 'in' and truthy checks like Boolean(set.constructor)
- // independent of any properties defined on Object.prototype.
- // Prevent prototype setters from intercepting set as a this value.
- setPrototypeOf(set, null);
- }
- let l = array.length;
- while (l--) {
- let element = array[l];
- if (typeof element === 'string') {
- const lcElement = transformCaseFunc(element);
- if (lcElement !== element) {
- // Config presets (e.g. tags.js, attrs.js) are immutable.
- if (!isFrozen(array)) {
- array[l] = lcElement;
- }
- element = lcElement;
- }
- }
- set[element] = true;
- }
- return set;
-}
-/**
- * Clean up an array to harden against CSPP
- *
- * @param array - The array to be cleaned.
- * @returns The cleaned version of the array
- */
-function cleanArray(array) {
- for (let index = 0; index < array.length; index++) {
- const isPropertyExist = objectHasOwnProperty(array, index);
- if (!isPropertyExist) {
- array[index] = null;
- }
- }
- return array;
-}
-/**
- * Shallow clone an object
- *
- * @param object - The object to be cloned.
- * @returns A new object that copies the original.
- */
-function clone(object) {
- const newObject = create(null);
- for (const [property, value] of entries(object)) {
- const isPropertyExist = objectHasOwnProperty(object, property);
- if (isPropertyExist) {
- if (Array.isArray(value)) {
- newObject[property] = cleanArray(value);
- } else if (value && typeof value === 'object' && value.constructor === Object) {
- newObject[property] = clone(value);
- } else {
- newObject[property] = value;
- }
- }
- }
- return newObject;
-}
-/**
- * This method automatically checks if the prop is function or getter and behaves accordingly.
- *
- * @param object - The object to look up the getter function in its prototype chain.
- * @param prop - The property name for which to find the getter function.
- * @returns The getter function found in the prototype chain or a fallback function.
- */
-function lookupGetter(object, prop) {
- while (object !== null) {
- const desc = getOwnPropertyDescriptor(object, prop);
- if (desc) {
- if (desc.get) {
- return unapply(desc.get);
- }
- if (typeof desc.value === 'function') {
- return unapply(desc.value);
- }
- }
- object = getPrototypeOf(object);
- }
- function fallbackValue() {
- return null;
- }
- return fallbackValue;
-}
-
-const html$1 = freeze(['a', 'abbr', 'acronym', 'address', 'area', 'article', 'aside', 'audio', 'b', 'bdi', 'bdo', 'big', 'blink', 'blockquote', 'body', 'br', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'content', 'data', 'datalist', 'dd', 'decorator', 'del', 'details', 'dfn', 'dialog', 'dir', 'div', 'dl', 'dt', 'element', 'em', 'fieldset', 'figcaption', 'figure', 'font', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'i', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'main', 'map', 'mark', 'marquee', 'menu', 'menuitem', 'meter', 'nav', 'nobr', 'ol', 'optgroup', 'option', 'output', 'p', 'picture', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'section', 'select', 'shadow', 'small', 'source', 'spacer', 'span', 'strike', 'strong', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'template', 'textarea', 'tfoot', 'th', 'thead', 'time', 'tr', 'track', 'tt', 'u', 'ul', 'var', 'video', 'wbr']);
-const svg$1 = freeze(['svg', 'a', 'altglyph', 'altglyphdef', 'altglyphitem', 'animatecolor', 'animatemotion', 'animatetransform', 'circle', 'clippath', 'defs', 'desc', 'ellipse', 'filter', 'font', 'g', 'glyph', 'glyphref', 'hkern', 'image', 'line', 'lineargradient', 'marker', 'mask', 'metadata', 'mpath', 'path', 'pattern', 'polygon', 'polyline', 'radialgradient', 'rect', 'stop', 'style', 'switch', 'symbol', 'text', 'textpath', 'title', 'tref', 'tspan', 'view', 'vkern']);
-const svgFilters = freeze(['feBlend', 'feColorMatrix', 'feComponentTransfer', 'feComposite', 'feConvolveMatrix', 'feDiffuseLighting', 'feDisplacementMap', 'feDistantLight', 'feDropShadow', 'feFlood', 'feFuncA', 'feFuncB', 'feFuncG', 'feFuncR', 'feGaussianBlur', 'feImage', 'feMerge', 'feMergeNode', 'feMorphology', 'feOffset', 'fePointLight', 'feSpecularLighting', 'feSpotLight', 'feTile', 'feTurbulence']);
-// List of SVG elements that are disallowed by default.
-// We still need to know them so that we can do namespace
-// checks properly in case one wants to add them to
-// allow-list.
-const svgDisallowed = freeze(['animate', 'color-profile', 'cursor', 'discard', 'font-face', 'font-face-format', 'font-face-name', 'font-face-src', 'font-face-uri', 'foreignobject', 'hatch', 'hatchpath', 'mesh', 'meshgradient', 'meshpatch', 'meshrow', 'missing-glyph', 'script', 'set', 'solidcolor', 'unknown', 'use']);
-const mathMl$1 = freeze(['math', 'menclose', 'merror', 'mfenced', 'mfrac', 'mglyph', 'mi', 'mlabeledtr', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom', 'mroot', 'mrow', 'ms', 'mspace', 'msqrt', 'mstyle', 'msub', 'msup', 'msubsup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder', 'munderover', 'mprescripts']);
-// Similarly to SVG, we want to know all MathML elements,
-// even those that we disallow by default.
-const mathMlDisallowed = freeze(['maction', 'maligngroup', 'malignmark', 'mlongdiv', 'mscarries', 'mscarry', 'msgroup', 'mstack', 'msline', 'msrow', 'semantics', 'annotation', 'annotation-xml', 'mprescripts', 'none']);
-const text = freeze(['#text']);
-
-const html = freeze(['accept', 'action', 'align', 'alt', 'autocapitalize', 'autocomplete', 'autopictureinpicture', 'autoplay', 'background', 'bgcolor', 'border', 'capture', 'cellpadding', 'cellspacing', 'checked', 'cite', 'class', 'clear', 'color', 'cols', 'colspan', 'controls', 'controlslist', 'coords', 'crossorigin', 'datetime', 'decoding', 'default', 'dir', 'disabled', 'disablepictureinpicture', 'disableremoteplayback', 'download', 'draggable', 'enctype', 'enterkeyhint', 'face', 'for', 'headers', 'height', 'hidden', 'high', 'href', 'hreflang', 'id', 'inputmode', 'integrity', 'ismap', 'kind', 'label', 'lang', 'list', 'loading', 'loop', 'low', 'max', 'maxlength', 'media', 'method', 'min', 'minlength', 'multiple', 'muted', 'name', 'nonce', 'noshade', 'novalidate', 'nowrap', 'open', 'optimum', 'pattern', 'placeholder', 'playsinline', 'popover', 'popovertarget', 'popovertargetaction', 'poster', 'preload', 'pubdate', 'radiogroup', 'readonly', 'rel', 'required', 'rev', 'reversed', 'role', 'rows', 'rowspan', 'spellcheck', 'scope', 'selected', 'shape', 'size', 'sizes', 'span', 'srclang', 'start', 'src', 'srcset', 'step', 'style', 'summary', 'tabindex', 'title', 'translate', 'type', 'usemap', 'valign', 'value', 'width', 'wrap', 'xmlns', 'slot']);
-const svg = freeze(['accent-height', 'accumulate', 'additive', 'alignment-baseline', 'amplitude', 'ascent', 'attributename', 'attributetype', 'azimuth', 'basefrequency', 'baseline-shift', 'begin', 'bias', 'by', 'class', 'clip', 'clippathunits', 'clip-path', 'clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cx', 'cy', 'd', 'dx', 'dy', 'diffuseconstant', 'direction', 'display', 'divisor', 'dur', 'edgemode', 'elevation', 'end', 'exponent', 'fill', 'fill-opacity', 'fill-rule', 'filter', 'filterunits', 'flood-color', 'flood-opacity', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'fx', 'fy', 'g1', 'g2', 'glyph-name', 'glyphref', 'gradientunits', 'gradienttransform', 'height', 'href', 'id', 'image-rendering', 'in', 'in2', 'intercept', 'k', 'k1', 'k2', 'k3', 'k4', 'kerning', 'keypoints', 'keysplines', 'keytimes', 'lang', 'lengthadjust', 'letter-spacing', 'kernelmatrix', 'kernelunitlength', 'lighting-color', 'local', 'marker-end', 'marker-mid', 'marker-start', 'markerheight', 'markerunits', 'markerwidth', 'maskcontentunits', 'maskunits', 'max', 'mask', 'media', 'method', 'mode', 'min', 'name', 'numoctaves', 'offset', 'operator', 'opacity', 'order', 'orient', 'orientation', 'origin', 'overflow', 'paint-order', 'path', 'pathlength', 'patterncontentunits', 'patterntransform', 'patternunits', 'points', 'preservealpha', 'preserveaspectratio', 'primitiveunits', 'r', 'rx', 'ry', 'radius', 'refx', 'refy', 'repeatcount', 'repeatdur', 'restart', 'result', 'rotate', 'scale', 'seed', 'shape-rendering', 'slope', 'specularconstant', 'specularexponent', 'spreadmethod', 'startoffset', 'stddeviation', 'stitchtiles', 'stop-color', 'stop-opacity', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke', 'stroke-width', 'style', 'surfacescale', 'systemlanguage', 'tabindex', 'tablevalues', 'targetx', 'targety', 'transform', 'transform-origin', 'text-anchor', 'text-decoration', 'text-rendering', 'textlength', 'type', 'u1', 'u2', 'unicode', 'values', 'viewbox', 'visibility', 'version', 'vert-adv-y', 'vert-origin-x', 'vert-origin-y', 'width', 'word-spacing', 'wrap', 'writing-mode', 'xchannelselector', 'ychannelselector', 'x', 'x1', 'x2', 'xmlns', 'y', 'y1', 'y2', 'z', 'zoomandpan']);
-const mathMl = freeze(['accent', 'accentunder', 'align', 'bevelled', 'close', 'columnsalign', 'columnlines', 'columnspan', 'denomalign', 'depth', 'dir', 'display', 'displaystyle', 'encoding', 'fence', 'frame', 'height', 'href', 'id', 'largeop', 'length', 'linethickness', 'lspace', 'lquote', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant', 'maxsize', 'minsize', 'movablelimits', 'notation', 'numalign', 'open', 'rowalign', 'rowlines', 'rowspacing', 'rowspan', 'rspace', 'rquote', 'scriptlevel', 'scriptminsize', 'scriptsizemultiplier', 'selection', 'separator', 'separators', 'stretchy', 'subscriptshift', 'supscriptshift', 'symmetric', 'voffset', 'width', 'xmlns']);
-const xml = freeze(['xlink:href', 'xml:id', 'xlink:title', 'xml:space', 'xmlns:xlink']);
-
-// eslint-disable-next-line unicorn/better-regex
-const MUSTACHE_EXPR = seal(/\{\{[\w\W]*|[\w\W]*\}\}/gm); // Specify template detection regex for SAFE_FOR_TEMPLATES mode
-const ERB_EXPR = seal(/<%[\w\W]*|[\w\W]*%>/gm);
-const TMPLIT_EXPR = seal(/\$\{[\w\W]*/gm); // eslint-disable-line unicorn/better-regex
-const DATA_ATTR = seal(/^data-[\-\w.\u00B7-\uFFFF]+$/); // eslint-disable-line no-useless-escape
-const ARIA_ATTR = seal(/^aria-[\-\w]+$/); // eslint-disable-line no-useless-escape
-const IS_ALLOWED_URI = seal(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i // eslint-disable-line no-useless-escape
-);
-const IS_SCRIPT_OR_DATA = seal(/^(?:\w+script|data):/i);
-const ATTR_WHITESPACE = seal(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g // eslint-disable-line no-control-regex
-);
-const DOCTYPE_NAME = seal(/^html$/i);
-const CUSTOM_ELEMENT = seal(/^[a-z][.\w]*(-[.\w]+)+$/i);
-
-var EXPRESSIONS = /*#__PURE__*/Object.freeze({
- __proto__: null,
- ARIA_ATTR: ARIA_ATTR,
- ATTR_WHITESPACE: ATTR_WHITESPACE,
- CUSTOM_ELEMENT: CUSTOM_ELEMENT,
- DATA_ATTR: DATA_ATTR,
- DOCTYPE_NAME: DOCTYPE_NAME,
- ERB_EXPR: ERB_EXPR,
- IS_ALLOWED_URI: IS_ALLOWED_URI,
- IS_SCRIPT_OR_DATA: IS_SCRIPT_OR_DATA,
- MUSTACHE_EXPR: MUSTACHE_EXPR,
- TMPLIT_EXPR: TMPLIT_EXPR
-});
-
-/* eslint-disable @typescript-eslint/indent */
-// https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
-const NODE_TYPE = {
- element: 1,
- attribute: 2,
- text: 3,
- cdataSection: 4,
- entityReference: 5,
- // Deprecated
- entityNode: 6,
- // Deprecated
- progressingInstruction: 7,
- comment: 8,
- document: 9,
- documentType: 10,
- documentFragment: 11,
- notation: 12 // Deprecated
-};
-const getGlobal = function getGlobal() {
- return typeof window === 'undefined' ? null : window;
-};
-/**
- * Creates a no-op policy for internal use only.
- * Don't export this function outside this module!
- * @param trustedTypes The policy factory.
- * @param purifyHostElement The Script element used to load DOMPurify (to determine policy name suffix).
- * @return The policy created (or null, if Trusted Types
- * are not supported or creating the policy failed).
- */
-const _createTrustedTypesPolicy = function _createTrustedTypesPolicy(trustedTypes, purifyHostElement) {
- if (typeof trustedTypes !== 'object' || typeof trustedTypes.createPolicy !== 'function') {
- return null;
- }
- // Allow the callers to control the unique policy name
- // by adding a data-tt-policy-suffix to the script element with the DOMPurify.
- // Policy creation with duplicate names throws in Trusted Types.
- let suffix = null;
- const ATTR_NAME = 'data-tt-policy-suffix';
- if (purifyHostElement && purifyHostElement.hasAttribute(ATTR_NAME)) {
- suffix = purifyHostElement.getAttribute(ATTR_NAME);
- }
- const policyName = 'dompurify' + (suffix ? '#' + suffix : '');
- try {
- return trustedTypes.createPolicy(policyName, {
- createHTML(html) {
- return html;
- },
- createScriptURL(scriptUrl) {
- return scriptUrl;
- }
- });
- } catch (_) {
- // Policy creation failed (most likely another DOMPurify script has
- // already run). Skip creating the policy, as this will only cause errors
- // if TT are enforced.
- console.warn('TrustedTypes policy ' + policyName + ' could not be created.');
- return null;
- }
-};
-const _createHooksMap = function _createHooksMap() {
- return {
- afterSanitizeAttributes: [],
- afterSanitizeElements: [],
- afterSanitizeShadowDOM: [],
- beforeSanitizeAttributes: [],
- beforeSanitizeElements: [],
- beforeSanitizeShadowDOM: [],
- uponSanitizeAttribute: [],
- uponSanitizeElement: [],
- uponSanitizeShadowNode: []
- };
-};
-function createDOMPurify() {
- let window = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getGlobal();
- const DOMPurify = root => createDOMPurify(root);
- DOMPurify.version = '3.2.4';
- DOMPurify.removed = [];
- if (!window || !window.document || window.document.nodeType !== NODE_TYPE.document || !window.Element) {
- // Not running in a browser, provide a factory function
- // so that you can pass your own Window
- DOMPurify.isSupported = false;
- return DOMPurify;
- }
- let {
- document
- } = window;
- const originalDocument = document;
- const currentScript = originalDocument.currentScript;
- const {
- DocumentFragment,
- HTMLTemplateElement,
- Node,
- Element,
- NodeFilter,
- NamedNodeMap = window.NamedNodeMap || window.MozNamedAttrMap,
- HTMLFormElement,
- DOMParser,
- trustedTypes
- } = window;
- const ElementPrototype = Element.prototype;
- const cloneNode = lookupGetter(ElementPrototype, 'cloneNode');
- const remove = lookupGetter(ElementPrototype, 'remove');
- const getNextSibling = lookupGetter(ElementPrototype, 'nextSibling');
- const getChildNodes = lookupGetter(ElementPrototype, 'childNodes');
- const getParentNode = lookupGetter(ElementPrototype, 'parentNode');
- // As per issue #47, the web-components registry is inherited by a
- // new document created via createHTMLDocument. As per the spec
- // (http://w3c.github.io/webcomponents/spec/custom/#creating-and-passing-registries)
- // a new empty registry is used when creating a template contents owner
- // document, so we use that as our parent document to ensure nothing
- // is inherited.
- if (typeof HTMLTemplateElement === 'function') {
- const template = document.createElement('template');
- if (template.content && template.content.ownerDocument) {
- document = template.content.ownerDocument;
- }
- }
- let trustedTypesPolicy;
- let emptyHTML = '';
- const {
- implementation,
- createNodeIterator,
- createDocumentFragment,
- getElementsByTagName
- } = document;
- const {
- importNode
- } = originalDocument;
- let hooks = _createHooksMap();
- /**
- * Expose whether this browser supports running the full DOMPurify.
- */
- DOMPurify.isSupported = typeof entries === 'function' && typeof getParentNode === 'function' && implementation && implementation.createHTMLDocument !== undefined;
- const {
- MUSTACHE_EXPR,
- ERB_EXPR,
- TMPLIT_EXPR,
- DATA_ATTR,
- ARIA_ATTR,
- IS_SCRIPT_OR_DATA,
- ATTR_WHITESPACE,
- CUSTOM_ELEMENT
- } = EXPRESSIONS;
- let {
- IS_ALLOWED_URI: IS_ALLOWED_URI$1
- } = EXPRESSIONS;
- /**
- * We consider the elements and attributes below to be safe. Ideally
- * don't add any new ones but feel free to remove unwanted ones.
- */
- /* allowed element names */
- let ALLOWED_TAGS = null;
- const DEFAULT_ALLOWED_TAGS = addToSet({}, [...html$1, ...svg$1, ...svgFilters, ...mathMl$1, ...text]);
- /* Allowed attribute names */
- let ALLOWED_ATTR = null;
- const DEFAULT_ALLOWED_ATTR = addToSet({}, [...html, ...svg, ...mathMl, ...xml]);
- /*
- * Configure how DOMPurify should handle custom elements and their attributes as well as customized built-in elements.
- * @property {RegExp|Function|null} tagNameCheck one of [null, regexPattern, predicate]. Default: `null` (disallow any custom elements)
- * @property {RegExp|Function|null} attributeNameCheck one of [null, regexPattern, predicate]. Default: `null` (disallow any attributes not on the allow list)
- * @property {boolean} allowCustomizedBuiltInElements allow custom elements derived from built-ins if they pass CUSTOM_ELEMENT_HANDLING.tagNameCheck. Default: `false`.
- */
- let CUSTOM_ELEMENT_HANDLING = Object.seal(create(null, {
- tagNameCheck: {
- writable: true,
- configurable: false,
- enumerable: true,
- value: null
- },
- attributeNameCheck: {
- writable: true,
- configurable: false,
- enumerable: true,
- value: null
- },
- allowCustomizedBuiltInElements: {
- writable: true,
- configurable: false,
- enumerable: true,
- value: false
- }
- }));
- /* Explicitly forbidden tags (overrides ALLOWED_TAGS/ADD_TAGS) */
- let FORBID_TAGS = null;
- /* Explicitly forbidden attributes (overrides ALLOWED_ATTR/ADD_ATTR) */
- let FORBID_ATTR = null;
- /* Decide if ARIA attributes are okay */
- let ALLOW_ARIA_ATTR = true;
- /* Decide if custom data attributes are okay */
- let ALLOW_DATA_ATTR = true;
- /* Decide if unknown protocols are okay */
- let ALLOW_UNKNOWN_PROTOCOLS = false;
- /* Decide if self-closing tags in attributes are allowed.
- * Usually removed due to a mXSS issue in jQuery 3.0 */
- let ALLOW_SELF_CLOSE_IN_ATTR = true;
- /* Output should be safe for common template engines.
- * This means, DOMPurify removes data attributes, mustaches and ERB
- */
- let SAFE_FOR_TEMPLATES = false;
- /* Output should be safe even for XML used within HTML and alike.
- * This means, DOMPurify removes comments when containing risky content.
- */
- let SAFE_FOR_XML = true;
- /* Decide if document with ... should be returned */
- let WHOLE_DOCUMENT = false;
- /* Track whether config is already set on this instance of DOMPurify. */
- let SET_CONFIG = false;
- /* Decide if all elements (e.g. style, script) must be children of
- * document.body. By default, browsers might move them to document.head */
- let FORCE_BODY = false;
- /* Decide if a DOM `HTMLBodyElement` should be returned, instead of a html
- * string (or a TrustedHTML object if Trusted Types are supported).
- * If `WHOLE_DOCUMENT` is enabled a `HTMLHtmlElement` will be returned instead
- */
- let RETURN_DOM = false;
- /* Decide if a DOM `DocumentFragment` should be returned, instead of a html
- * string (or a TrustedHTML object if Trusted Types are supported) */
- let RETURN_DOM_FRAGMENT = false;
- /* Try to return a Trusted Type object instead of a string, return a string in
- * case Trusted Types are not supported */
- let RETURN_TRUSTED_TYPE = false;
- /* Output should be free from DOM clobbering attacks?
- * This sanitizes markups named with colliding, clobberable built-in DOM APIs.
- */
- let SANITIZE_DOM = true;
- /* Achieve full DOM Clobbering protection by isolating the namespace of named
- * properties and JS variables, mitigating attacks that abuse the HTML/DOM spec rules.
- *
- * HTML/DOM spec rules that enable DOM Clobbering:
- * - Named Access on Window (§7.3.3)
- * - DOM Tree Accessors (§3.1.5)
- * - Form Element Parent-Child Relations (§4.10.3)
- * - Iframe srcdoc / Nested WindowProxies (§4.8.5)
- * - HTMLCollection (§4.2.10.2)
- *
- * Namespace isolation is implemented by prefixing `id` and `name` attributes
- * with a constant string, i.e., `user-content-`
- */
- let SANITIZE_NAMED_PROPS = false;
- const SANITIZE_NAMED_PROPS_PREFIX = 'user-content-';
- /* Keep element content when removing element? */
- let KEEP_CONTENT = true;
- /* If a `Node` is passed to sanitize(), then performs sanitization in-place instead
- * of importing it into a new Document and returning a sanitized copy */
- let IN_PLACE = false;
- /* Allow usage of profiles like html, svg and mathMl */
- let USE_PROFILES = {};
- /* Tags to ignore content of when KEEP_CONTENT is true */
- let FORBID_CONTENTS = null;
- const DEFAULT_FORBID_CONTENTS = addToSet({}, ['annotation-xml', 'audio', 'colgroup', 'desc', 'foreignobject', 'head', 'iframe', 'math', 'mi', 'mn', 'mo', 'ms', 'mtext', 'noembed', 'noframes', 'noscript', 'plaintext', 'script', 'style', 'svg', 'template', 'thead', 'title', 'video', 'xmp']);
- /* Tags that are safe for data: URIs */
- let DATA_URI_TAGS = null;
- const DEFAULT_DATA_URI_TAGS = addToSet({}, ['audio', 'video', 'img', 'source', 'image', 'track']);
- /* Attributes safe for values like "javascript:" */
- let URI_SAFE_ATTRIBUTES = null;
- const DEFAULT_URI_SAFE_ATTRIBUTES = addToSet({}, ['alt', 'class', 'for', 'id', 'label', 'name', 'pattern', 'placeholder', 'role', 'summary', 'title', 'value', 'style', 'xmlns']);
- const MATHML_NAMESPACE = 'http://www.w3.org/1998/Math/MathML';
- const SVG_NAMESPACE = 'http://www.w3.org/2000/svg';
- const HTML_NAMESPACE = 'http://www.w3.org/1999/xhtml';
- /* Document namespace */
- let NAMESPACE = HTML_NAMESPACE;
- let IS_EMPTY_INPUT = false;
- /* Allowed XHTML+XML namespaces */
- let ALLOWED_NAMESPACES = null;
- const DEFAULT_ALLOWED_NAMESPACES = addToSet({}, [MATHML_NAMESPACE, SVG_NAMESPACE, HTML_NAMESPACE], stringToString);
- let MATHML_TEXT_INTEGRATION_POINTS = addToSet({}, ['mi', 'mo', 'mn', 'ms', 'mtext']);
- let HTML_INTEGRATION_POINTS = addToSet({}, ['annotation-xml']);
- // Certain elements are allowed in both SVG and HTML
- // namespace. We need to specify them explicitly
- // so that they don't get erroneously deleted from
- // HTML namespace.
- const COMMON_SVG_AND_HTML_ELEMENTS = addToSet({}, ['title', 'style', 'font', 'a', 'script']);
- /* Parsing of strict XHTML documents */
- let PARSER_MEDIA_TYPE = null;
- const SUPPORTED_PARSER_MEDIA_TYPES = ['application/xhtml+xml', 'text/html'];
- const DEFAULT_PARSER_MEDIA_TYPE = 'text/html';
- let transformCaseFunc = null;
- /* Keep a reference to config to pass to hooks */
- let CONFIG = null;
- /* Ideally, do not touch anything below this line */
- /* ______________________________________________ */
- const formElement = document.createElement('form');
- const isRegexOrFunction = function isRegexOrFunction(testValue) {
- return testValue instanceof RegExp || testValue instanceof Function;
- };
- /**
- * _parseConfig
- *
- * @param cfg optional config literal
- */
- // eslint-disable-next-line complexity
- const _parseConfig = function _parseConfig() {
- let cfg = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
- if (CONFIG && CONFIG === cfg) {
- return;
- }
- /* Shield configuration object from tampering */
- if (!cfg || typeof cfg !== 'object') {
- cfg = {};
- }
- /* Shield configuration object from prototype pollution */
- cfg = clone(cfg);
- PARSER_MEDIA_TYPE =
- // eslint-disable-next-line unicorn/prefer-includes
- SUPPORTED_PARSER_MEDIA_TYPES.indexOf(cfg.PARSER_MEDIA_TYPE) === -1 ? DEFAULT_PARSER_MEDIA_TYPE : cfg.PARSER_MEDIA_TYPE;
- // HTML tags and attributes are not case-sensitive, converting to lowercase. Keeping XHTML as is.
- transformCaseFunc = PARSER_MEDIA_TYPE === 'application/xhtml+xml' ? stringToString : stringToLowerCase;
- /* Set configuration parameters */
- ALLOWED_TAGS = objectHasOwnProperty(cfg, 'ALLOWED_TAGS') ? addToSet({}, cfg.ALLOWED_TAGS, transformCaseFunc) : DEFAULT_ALLOWED_TAGS;
- ALLOWED_ATTR = objectHasOwnProperty(cfg, 'ALLOWED_ATTR') ? addToSet({}, cfg.ALLOWED_ATTR, transformCaseFunc) : DEFAULT_ALLOWED_ATTR;
- ALLOWED_NAMESPACES = objectHasOwnProperty(cfg, 'ALLOWED_NAMESPACES') ? addToSet({}, cfg.ALLOWED_NAMESPACES, stringToString) : DEFAULT_ALLOWED_NAMESPACES;
- URI_SAFE_ATTRIBUTES = objectHasOwnProperty(cfg, 'ADD_URI_SAFE_ATTR') ? addToSet(clone(DEFAULT_URI_SAFE_ATTRIBUTES), cfg.ADD_URI_SAFE_ATTR, transformCaseFunc) : DEFAULT_URI_SAFE_ATTRIBUTES;
- DATA_URI_TAGS = objectHasOwnProperty(cfg, 'ADD_DATA_URI_TAGS') ? addToSet(clone(DEFAULT_DATA_URI_TAGS), cfg.ADD_DATA_URI_TAGS, transformCaseFunc) : DEFAULT_DATA_URI_TAGS;
- FORBID_CONTENTS = objectHasOwnProperty(cfg, 'FORBID_CONTENTS') ? addToSet({}, cfg.FORBID_CONTENTS, transformCaseFunc) : DEFAULT_FORBID_CONTENTS;
- FORBID_TAGS = objectHasOwnProperty(cfg, 'FORBID_TAGS') ? addToSet({}, cfg.FORBID_TAGS, transformCaseFunc) : {};
- FORBID_ATTR = objectHasOwnProperty(cfg, 'FORBID_ATTR') ? addToSet({}, cfg.FORBID_ATTR, transformCaseFunc) : {};
- USE_PROFILES = objectHasOwnProperty(cfg, 'USE_PROFILES') ? cfg.USE_PROFILES : false;
- ALLOW_ARIA_ATTR = cfg.ALLOW_ARIA_ATTR !== false; // Default true
- ALLOW_DATA_ATTR = cfg.ALLOW_DATA_ATTR !== false; // Default true
- ALLOW_UNKNOWN_PROTOCOLS = cfg.ALLOW_UNKNOWN_PROTOCOLS || false; // Default false
- ALLOW_SELF_CLOSE_IN_ATTR = cfg.ALLOW_SELF_CLOSE_IN_ATTR !== false; // Default true
- SAFE_FOR_TEMPLATES = cfg.SAFE_FOR_TEMPLATES || false; // Default false
- SAFE_FOR_XML = cfg.SAFE_FOR_XML !== false; // Default true
- WHOLE_DOCUMENT = cfg.WHOLE_DOCUMENT || false; // Default false
- RETURN_DOM = cfg.RETURN_DOM || false; // Default false
- RETURN_DOM_FRAGMENT = cfg.RETURN_DOM_FRAGMENT || false; // Default false
- RETURN_TRUSTED_TYPE = cfg.RETURN_TRUSTED_TYPE || false; // Default false
- FORCE_BODY = cfg.FORCE_BODY || false; // Default false
- SANITIZE_DOM = cfg.SANITIZE_DOM !== false; // Default true
- SANITIZE_NAMED_PROPS = cfg.SANITIZE_NAMED_PROPS || false; // Default false
- KEEP_CONTENT = cfg.KEEP_CONTENT !== false; // Default true
- IN_PLACE = cfg.IN_PLACE || false; // Default false
- IS_ALLOWED_URI$1 = cfg.ALLOWED_URI_REGEXP || IS_ALLOWED_URI;
- NAMESPACE = cfg.NAMESPACE || HTML_NAMESPACE;
- MATHML_TEXT_INTEGRATION_POINTS = cfg.MATHML_TEXT_INTEGRATION_POINTS || MATHML_TEXT_INTEGRATION_POINTS;
- HTML_INTEGRATION_POINTS = cfg.HTML_INTEGRATION_POINTS || HTML_INTEGRATION_POINTS;
- CUSTOM_ELEMENT_HANDLING = cfg.CUSTOM_ELEMENT_HANDLING || {};
- if (cfg.CUSTOM_ELEMENT_HANDLING && isRegexOrFunction(cfg.CUSTOM_ELEMENT_HANDLING.tagNameCheck)) {
- CUSTOM_ELEMENT_HANDLING.tagNameCheck = cfg.CUSTOM_ELEMENT_HANDLING.tagNameCheck;
- }
- if (cfg.CUSTOM_ELEMENT_HANDLING && isRegexOrFunction(cfg.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)) {
- CUSTOM_ELEMENT_HANDLING.attributeNameCheck = cfg.CUSTOM_ELEMENT_HANDLING.attributeNameCheck;
- }
- if (cfg.CUSTOM_ELEMENT_HANDLING && typeof cfg.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements === 'boolean') {
- CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements = cfg.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements;
- }
- if (SAFE_FOR_TEMPLATES) {
- ALLOW_DATA_ATTR = false;
- }
- if (RETURN_DOM_FRAGMENT) {
- RETURN_DOM = true;
- }
- /* Parse profile info */
- if (USE_PROFILES) {
- ALLOWED_TAGS = addToSet({}, text);
- ALLOWED_ATTR = [];
- if (USE_PROFILES.html === true) {
- addToSet(ALLOWED_TAGS, html$1);
- addToSet(ALLOWED_ATTR, html);
- }
- if (USE_PROFILES.svg === true) {
- addToSet(ALLOWED_TAGS, svg$1);
- addToSet(ALLOWED_ATTR, svg);
- addToSet(ALLOWED_ATTR, xml);
- }
- if (USE_PROFILES.svgFilters === true) {
- addToSet(ALLOWED_TAGS, svgFilters);
- addToSet(ALLOWED_ATTR, svg);
- addToSet(ALLOWED_ATTR, xml);
- }
- if (USE_PROFILES.mathMl === true) {
- addToSet(ALLOWED_TAGS, mathMl$1);
- addToSet(ALLOWED_ATTR, mathMl);
- addToSet(ALLOWED_ATTR, xml);
- }
- }
- /* Merge configuration parameters */
- if (cfg.ADD_TAGS) {
- if (ALLOWED_TAGS === DEFAULT_ALLOWED_TAGS) {
- ALLOWED_TAGS = clone(ALLOWED_TAGS);
- }
- addToSet(ALLOWED_TAGS, cfg.ADD_TAGS, transformCaseFunc);
- }
- if (cfg.ADD_ATTR) {
- if (ALLOWED_ATTR === DEFAULT_ALLOWED_ATTR) {
- ALLOWED_ATTR = clone(ALLOWED_ATTR);
- }
- addToSet(ALLOWED_ATTR, cfg.ADD_ATTR, transformCaseFunc);
- }
- if (cfg.ADD_URI_SAFE_ATTR) {
- addToSet(URI_SAFE_ATTRIBUTES, cfg.ADD_URI_SAFE_ATTR, transformCaseFunc);
- }
- if (cfg.FORBID_CONTENTS) {
- if (FORBID_CONTENTS === DEFAULT_FORBID_CONTENTS) {
- FORBID_CONTENTS = clone(FORBID_CONTENTS);
- }
- addToSet(FORBID_CONTENTS, cfg.FORBID_CONTENTS, transformCaseFunc);
- }
- /* Add #text in case KEEP_CONTENT is set to true */
- if (KEEP_CONTENT) {
- ALLOWED_TAGS['#text'] = true;
- }
- /* Add html, head and body to ALLOWED_TAGS in case WHOLE_DOCUMENT is true */
- if (WHOLE_DOCUMENT) {
- addToSet(ALLOWED_TAGS, ['html', 'head', 'body']);
- }
- /* Add tbody to ALLOWED_TAGS in case tables are permitted, see #286, #365 */
- if (ALLOWED_TAGS.table) {
- addToSet(ALLOWED_TAGS, ['tbody']);
- delete FORBID_TAGS.tbody;
- }
- if (cfg.TRUSTED_TYPES_POLICY) {
- if (typeof cfg.TRUSTED_TYPES_POLICY.createHTML !== 'function') {
- throw typeErrorCreate('TRUSTED_TYPES_POLICY configuration option must provide a "createHTML" hook.');
- }
- if (typeof cfg.TRUSTED_TYPES_POLICY.createScriptURL !== 'function') {
- throw typeErrorCreate('TRUSTED_TYPES_POLICY configuration option must provide a "createScriptURL" hook.');
- }
- // Overwrite existing TrustedTypes policy.
- trustedTypesPolicy = cfg.TRUSTED_TYPES_POLICY;
- // Sign local variables required by `sanitize`.
- emptyHTML = trustedTypesPolicy.createHTML('');
- } else {
- // Uninitialized policy, attempt to initialize the internal dompurify policy.
- if (trustedTypesPolicy === undefined) {
- trustedTypesPolicy = _createTrustedTypesPolicy(trustedTypes, currentScript);
- }
- // If creating the internal policy succeeded sign internal variables.
- if (trustedTypesPolicy !== null && typeof emptyHTML === 'string') {
- emptyHTML = trustedTypesPolicy.createHTML('');
- }
- }
- // Prevent further manipulation of configuration.
- // Not available in IE8, Safari 5, etc.
- if (freeze) {
- freeze(cfg);
- }
- CONFIG = cfg;
- };
- /* Keep track of all possible SVG and MathML tags
- * so that we can perform the namespace checks
- * correctly. */
- const ALL_SVG_TAGS = addToSet({}, [...svg$1, ...svgFilters, ...svgDisallowed]);
- const ALL_MATHML_TAGS = addToSet({}, [...mathMl$1, ...mathMlDisallowed]);
- /**
- * @param element a DOM element whose namespace is being checked
- * @returns Return false if the element has a
- * namespace that a spec-compliant parser would never
- * return. Return true otherwise.
- */
- const _checkValidNamespace = function _checkValidNamespace(element) {
- let parent = getParentNode(element);
- // In JSDOM, if we're inside shadow DOM, then parentNode
- // can be null. We just simulate parent in this case.
- if (!parent || !parent.tagName) {
- parent = {
- namespaceURI: NAMESPACE,
- tagName: 'template'
- };
- }
- const tagName = stringToLowerCase(element.tagName);
- const parentTagName = stringToLowerCase(parent.tagName);
- if (!ALLOWED_NAMESPACES[element.namespaceURI]) {
- return false;
- }
- if (element.namespaceURI === SVG_NAMESPACE) {
- // The only way to switch from HTML namespace to SVG
- // is via