Remove --no-devui. Fix OpenAI clients. Fix execution test sandbox ignores.

Author: jeffhandley

src/ProjectTemplates/.gitignore

@@ -12,8 +12,8 @@ package-lock.json
 */src/**/Directory.Build.props
 */src/**/ingestioncache.*
 
-# The aichatweb template includes hard-coded launchSettings.json files in the template
-!Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/*/Properties/launchSettings.json
+# The project templates include hard-coded launchSettings.json files
+!*/src/**/Properties/launchSettings.json
 
 # Templates include JS dependencies in dist folders.
 !**/dist/*

src/ProjectTemplates/GeneratedContent.targets

@@ -34,8 +34,8 @@
       Specifies external packages that get referenced in generated template content.
     -->
     <PropertyGroup>
-      <TemplatePackageVersion_MicrosoftAgentsAI>1.0.0-preview.251107.2</TemplatePackageVersion_MicrosoftAgentsAI>
-      <TemplatePackageVersion_MicrosoftAgentsAIHostingOpenAI>1.0.0-alpha.251107.2</TemplatePackageVersion_MicrosoftAgentsAIHostingOpenAI>
+      <TemplatePackageVersion_MicrosoftAgentsAI>1.0.0-local.251108.1</TemplatePackageVersion_MicrosoftAgentsAI>
+      <TemplatePackageVersion_MicrosoftAgentsAIHostingOpenAI>1.0.0-local.251108.1</TemplatePackageVersion_MicrosoftAgentsAIHostingOpenAI>
       <TemplatePackageVersion_Aspire>9.5.1</TemplatePackageVersion_Aspire>
       <TemplatePackageVersion_Aspire_Preview>9.5.1-preview.1.25502.11</TemplatePackageVersion_Aspire_Preview>
       <TemplatePackageVersion_AzureAIProjects>1.0.0</TemplatePackageVersion_AzureAIProjects>
@@ -89,9 +89,6 @@
       <GeneratedContent
         Include="$(_WebApiAgentRoot)WebApiAgent-CSharp\WebApiAgent-CSharp.csproj.in"
         OutputPath="$(_WebApiAgentRoot)WebApiAgent-CSharp\WebApiAgent-CSharp.csproj" />
-      <GeneratedContent
-        Include="$(_WebApiAgentRoot)WebApiAgent-CSharp\Properties\launchSettings.json.in"
-        OutputPath="$(_WebApiAgentRoot)WebApiAgent-CSharp\Properties\launchSettings.json" />
       <GeneratedContent
         Include="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.sln.in"
         OutputPath="$(_ChatWithCustomDataContentRoot)ChatWithCustomData-CSharp.sln" />

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/.template.config/dotnetcli.host.json

@@ -16,13 +16,6 @@
       "longName": "managed-identity",
       "shortName": ""
     },
-    "UseDevUI": {
-      "isHidden": "true"
-    },
-    "DoNotUseDevUI": {
-      "longName": "no-devui",
-      "shortName": ""
-    },
     "httpPort": {
       "isHidden": "true",
       "longName": "httpPort",

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/.template.config/ide.host.json

@@ -15,14 +15,6 @@
     {
       "id": "UseManagedIdentity",
       "isVisible": true
-    },
-    {
-      "id": "UseDevUI",
-      "isVisible": true
-    },
-    {
-      "id": "DoNotUseDevUI",
-      "isVisible": false
     }
   ]
 }

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/.template.config/template.json

@@ -93,20 +93,6 @@
       "isEnabled": "(AiServiceProvider == \"azureopenai\")",
       "description": "Use managed identity to access Azure services"
     },
-    "UseDevUI": {
-      "type": "parameter",
-      "displayName": "Enable the Agent Framework developer UI",
-      "datatype": "bool",
-      "defaultValue": "true",
-      "description": "Add the Agent Framework developer UI for use in the development environment"
-    },
-    "DoNotUseDevUI": {
-      "type": "parameter",
-      "displayName": "Disable the Agent Framework developer UI",
-      "datatype": "bool",
-      "defaultValue": "false",
-      "description": "Do not add the Agent Framework developer UI"
-    },
     "ChatModel": {
       "type": "parameter",
       "displayName": "Model/deployment for chat completions. Example: gpt-4o-mini",
@@ -116,10 +102,6 @@
       "type": "computed",
       "value": "(UseManagedIdentity)"
     },
-    "IsDevUIEnabled": {
-      "type": "computed",
-      "value": "(UseDevUI && !DoNotUseDevUI)"
-    },
     "IsAzureOpenAI": {
       "type": "computed",
       "value": "(AiServiceProvider == \"azureopenai\")"

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/Program.cs

@@ -8,18 +8,17 @@
 using Azure.Identity;
 #endif
 using Microsoft.Agents.AI;
-#if (IsDevUIEnabled)
 using Microsoft.Agents.AI.DevUI;
-#endif
 using Microsoft.Agents.AI.Hosting;
 using Microsoft.Agents.AI.Workflows;
 using Microsoft.Extensions.AI;
 #if (IsOllama)
 using OllamaSharp;
-#elif (IsGHModels || IsOpenAI || IsAzureOpenAI)
+#endif
+#if (IsGHModels || IsAzureOpenAI)
 using OpenAI;
 #endif
-#if (IsGHModels)
+#if (IsGHModels || IsOpenAI || IsAzureOpenAI)
 using OpenAI.Chat;
 #endif
 
@@ -35,21 +34,15 @@
         new ApiKeyCredential(builder.Configuration["GitHubModels:Token"] ?? throw new InvalidOperationException("Missing configuration: GitHubModels:Token.")),
         new OpenAIClientOptions { Endpoint = new Uri("https://models.inference.ai.azure.com") })
     .AsIChatClient();
-#elif (IsOllama)
-// You will need to have Ollama running locally with the llama3.2 model installed
-// Visit https://ollama.com for installation instructions
-var chatClient = new OllamaApiClient(new Uri("http://localhost:11434"), "llama3.2");
 #elif (IsOpenAI)
 // You will need to set the API key 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 OpenAI:Key YOUR-API-KEY
-var openAIClient = new OpenAIClient(
-    new ApiKeyCredential(builder.Configuration["OpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: OpenAI:Key.")));
-
-#pragma warning disable OPENAI001 // GetOpenAIResponseClient(string) is experimental and subject to change or removal in future updates.
-var chatClient = openAIClient.GetOpenAIResponseClient("gpt-4o-mini").AsIChatClient();
-#pragma warning restore OPENAI001
+var chatClient = new ChatClient(
+        "gpt-4o-mini",
+        new ApiKeyCredential(builder.Configuration["OpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: OpenAI:Key.")))
+    .AsIChatClient();
 #elif (IsAzureOpenAI)
 // You will need to set the endpoint to your own value
 // You can do this using Visual Studio's "Manage User Secrets" UI, or on the command line:
@@ -59,20 +52,26 @@
 //   dotnet user-secrets set AzureOpenAI:Key YOUR-API-KEY
 #endif
 var azureOpenAIEndpoint = new Uri(new Uri(builder.Configuration["AzureOpenAI:Endpoint"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAI:Endpoint.")), "/openai/v1");
-#if (IsManagedIdentity)
-#pragma warning disable OPENAI001 // OpenAIClient(AuthenticationPolicy, OpenAIClientOptions) and GetOpenAIResponseClient(string) are experimental and subject to change or removal in future updates.
-var azureOpenAI = new OpenAIClient(
-    new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
-    new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint });
-
-#elif (!IsManagedIdentity)
-var openAIOptions = new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint };
-var azureOpenAI = new OpenAIClient(new ApiKeyCredential(builder.Configuration["AzureOpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAI:Key.")), openAIOptions);
 
-#pragma warning disable OPENAI001 // GetOpenAIResponseClient(string) is experimental and subject to change or removal in future updates.
-#endif
-var chatClient = azureOpenAI.GetOpenAIResponseClient("gpt-4o-mini").AsIChatClient();
+#if (IsManagedIdentity)
+#pragma warning disable OPENAI001 // The overload accepting an AuthenticationPolicy is experimental and may change or be removed in future releases.
+var chatClient = new ChatClient(
+        "gpt-4o-mini",
+        new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
+        new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint })
+    .AsIChatClient();
 #pragma warning restore OPENAI001
+#else
+var chatClient = new ChatClient(
+        "gpt-4o-mini",
+        new ApiKeyCredential(builder.Configuration["AzureOpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAI:Key.")),
+        new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint })
+    .AsIChatClient();
+#endif
+#elif (IsOllama)
+// You will need to have Ollama running locally with the llama3.2 model installed
+// Visit https://ollama.com for installation instructions
+var chatClient = new OllamaApiClient(new Uri("http://localhost:11434"), "llama3.2");
 #endif
 
 builder.Services.AddChatClient(chatClient);
@@ -92,31 +91,23 @@
     sp.GetRequiredKeyedService<AIAgent>("editor")
 )).AddAsAIAgent();
 
-// Register services for OpenAI responses and conversations
-#if (IsDevUIEnabled)
-// This is also required for DevUI
-#endif
+// 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
-#if (IsDevUIEnabled)
-// This is also required for DevUI
-#endif
+// Map endpoints for OpenAI responses and conversations (also required for DevUI)
 app.MapOpenAIResponses();
 app.MapOpenAIConversations();
 
-#if (IsDevUIEnabled)
 if (builder.Environment.IsDevelopment())
 {
     // Map DevUI endpoint to /devui
     app.MapDevUI();
 }
 
-#endif
 app.Run();
 
 [Description("Formats the story for publication, revealing its title.")]

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/Properties/launchSettings.json.in renamed to src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/Properties/launchSettings.json

@@ -4,12 +4,8 @@
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-//#if (IsDevUIEnabled)
       "launchBrowser": true,
       "launchUrl": "devui/",
-//#else
-      "launchBrowser": false,
-//#endif
       "applicationUrl": "http://localhost:5056",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -18,12 +14,8 @@
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-//#if (IsDevUIEnabled)
       "launchBrowser": true,
       "launchUrl": "devui/",
-//#else
-      "launchBrowser": false,
-//#endif
       "applicationUrl": "https://localhost:7041;http://localhost:5056",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/README.md

@@ -165,10 +165,8 @@ The application will start and listen on:
 
 The application exposes OpenAI-compatible API endpoints. You can interact with the AI agents using any OpenAI-compatible client or tools.
 
-<!--#if (IsDevUIEnabled) -->
 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.
 
-<!--#endif -->
 ## How It Works
 
 This application demonstrates Agent Framework with:

src/ProjectTemplates/Microsoft.Agents.AI.Templates/src/WebApiAgent/WebApiAgent-CSharp/WebApiAgent-CSharp.csproj.in

@@ -9,9 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Agents.AI" Version="${TemplatePackageVersion_MicrosoftAgentsAI}" />
-<!--#if (IsDevUIEnabled) -->
     <PackageReference Include="Microsoft.Agents.AI.DevUI" Version="${TemplatePackageVersion_MicrosoftAgentsAI}" />
-<!--#endif -->
     <PackageReference Include="Microsoft.Agents.AI.Hosting" Version="${TemplatePackageVersion_MicrosoftAgentsAI}" />
     <PackageReference Include="Microsoft.Agents.AI.Hosting.OpenAI" Version="${TemplatePackageVersion_MicrosoftAgentsAIHostingOpenAI}" />
 <!--#if (IsOpenAI || IsAzureOpenAI || IsGHModels) -->

test/ProjectTemplates/Microsoft.Agents.AI.Templates.IntegrationTests/Microsoft.Agents.AI.Templates.Tests.csproj

@@ -17,12 +17,15 @@
 
   <ItemGroup>
     <Compile Include="..\Infrastructure\*.cs" Link="Infrastructure\%(Filename)%(Extension)" />
+    <Compile Remove="ExecutionTestSandbox\**" />
 
     <Compile Remove="Snapshots\**\*.*" />
     <None Include="Snapshots\**\*.*" />
 
-    <Compile Remove="ExecutionTemplateSandbox\**\*.*" />
-    <None Include="ExecutionTemplateSandbox\**\*.*" />
+    <Content Remove="ExecutionTestSandbox\**" />
+    <Compile Remove="ExecutionTestSandbox\**" />
+    <EmbeddedResource Remove="ExecutionTestSandbox\**" />
+    <None Remove="ExecutionTestSandbox\**" />
 
     <None Include="README.md" />
   </ItemGroup>