Merge pull request #148 from dotnet-presentations/end-to-end-test

Complete end-to-end workshop test (Parts 1-9) with snapshot updates

Author: jongalloway

.github/prompts/test-workshop.prompt.md

@@ -77,36 +77,7 @@ function Set-WorkshopCredentials {
         $azureKey = Read-Host -Prompt "Enter your Azure OpenAI API key" -AsSecureString
         if ($azureKey.Length -gt 0) {
             $env:WORKSHOP_AZURE_OPENAI_KEY = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto([System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($azureKey))
-                [Environment]::SetEnvironmentVariable("WORKSHOP_AZURE_OPENAI_KEY", $AzureOpenAIKey, "User")
-}
-
-# Check for Azure Subscription ID
-$AzureSubscriptionId = [Environment]::GetEnvironmentVariable("WORKSHOP_AZURE_SUBSCRIPTION_ID", "User")
-if (-not $AzureSubscriptionId) {
-    Write-Host "`n🔑 Azure Subscription ID not found. Please provide your Azure subscription ID for deployment." -ForegroundColor Yellow
-    Write-Host "You can find this in the Azure Portal under Subscriptions." -ForegroundColor Gray
-    
-    do {
-        $AzureSubscriptionId = Read-Host "Enter Azure Subscription ID"
-    } while ([string]::IsNullOrWhiteSpace($AzureSubscriptionId))
-    
-    Write-Host "✅ Saving Azure Subscription ID to environment variables..." -ForegroundColor Green
-    [Environment]::SetEnvironmentVariable("WORKSHOP_AZURE_SUBSCRIPTION_ID", $AzureSubscriptionId, "User")
-}
-
-# Check for Azure Location
-$AzureLocation = [Environment]::GetEnvironmentVariable("WORKSHOP_AZURE_LOCATION", "User")
-if (-not $AzureLocation) {
-    Write-Host "`n🌍 Azure Location not found. Please provide your preferred Azure region for deployment." -ForegroundColor Yellow
-    Write-Host "Common options: eastus, westus2, centralus, westeurope, eastasia" -ForegroundColor Gray
-    
-    do {
-        $AzureLocation = Read-Host "Enter Azure Location (e.g., eastus)"
-    } while ([string]::IsNullOrWhiteSpace($AzureLocation))
-    
-    Write-Host "✅ Saving Azure Location to environment variables..." -ForegroundColor Green
-    [Environment]::SetEnvironmentVariable("WORKSHOP_AZURE_LOCATION", $AzureLocation, "User")
-}
+            [Environment]::SetEnvironmentVariable("WORKSHOP_AZURE_OPENAI_KEY", $env:WORKSHOP_AZURE_OPENAI_KEY, "User")
             Write-Host "✓ Azure OpenAI key saved to environment variable WORKSHOP_AZURE_OPENAI_KEY" -ForegroundColor Green
         } else {
             Write-Host "⚠ Azure OpenAI key was empty, skipping..." -ForegroundColor Yellow
@@ -115,6 +86,48 @@ if (-not $AzureLocation) {
         Write-Host "✓ Azure OpenAI key found in environment variable WORKSHOP_AZURE_OPENAI_KEY" -ForegroundColor Green
     }
 
+    
+    Write-Host ""
+    
+    # Check for Azure Subscription ID
+    if (-not $env:WORKSHOP_AZURE_SUBSCRIPTION_ID) {
+        Write-Host "Azure Subscription ID not found in environment variable WORKSHOP_AZURE_SUBSCRIPTION_ID" -ForegroundColor Yellow
+        Write-Host "This is needed for Azure deployment in Part 6" -ForegroundColor Gray
+        Write-Host ""
+        
+        $azureSubscriptionId = Read-Host -Prompt "Enter your Azure Subscription ID (or press Enter to skip)"
+        if ($azureSubscriptionId.Length -gt 0) {
+            $env:WORKSHOP_AZURE_SUBSCRIPTION_ID = $azureSubscriptionId
+            [Environment]::SetEnvironmentVariable("WORKSHOP_AZURE_SUBSCRIPTION_ID", $azureSubscriptionId, "User")
+            Write-Host "✓ Azure Subscription ID saved to environment variable WORKSHOP_AZURE_SUBSCRIPTION_ID" -ForegroundColor Green
+        } else {
+            Write-Host "⚠ Azure Subscription ID was empty, skipping..." -ForegroundColor Yellow
+        }
+    } else {
+        Write-Host "✓ Azure Subscription ID found in environment variable WORKSHOP_AZURE_SUBSCRIPTION_ID" -ForegroundColor Green
+    }
+    
+    Write-Host ""
+    
+    # Check for Azure Location
+    if (-not $env:WORKSHOP_AZURE_LOCATION) {
+        Write-Host "Azure Location not found in environment variable WORKSHOP_AZURE_LOCATION" -ForegroundColor Yellow
+        Write-Host "This is needed for Azure deployment in Part 6" -ForegroundColor Gray
+        Write-Host "Common options: eastus, westus2, centralus, westeurope, eastasia" -ForegroundColor Gray
+        Write-Host ""
+        
+        $azureLocation = Read-Host -Prompt "Enter your Azure Location (or press Enter to skip)"
+        if ($azureLocation.Length -gt 0) {
+            $env:WORKSHOP_AZURE_LOCATION = $azureLocation
+            [Environment]::SetEnvironmentVariable("WORKSHOP_AZURE_LOCATION", $azureLocation, "User")
+            Write-Host "✓ Azure Location saved to environment variable WORKSHOP_AZURE_LOCATION" -ForegroundColor Green
+        } else {
+            Write-Host "⚠ Azure Location was empty, skipping..." -ForegroundColor Yellow
+        }
+    } else {
+        Write-Host "✓ Azure Location found in environment variable WORKSHOP_AZURE_LOCATION" -ForegroundColor Green
+    }
+    
     Write-Host ""
 
     # Check for Azure AI Search credentials (optional)

.github/scripts/setup-workshop-credentials.ps1

@@ -32,10 +32,10 @@ jobs:
             dotnet-version: '9.0.x'
           # No solution file exists for MyMcpServer; using project file directly
           - solution: "Part 7 - MCP Server Basics/MyMcpServer/MyMcpServer.csproj"
-            dotnet-version: '8.0.x'
+            dotnet-version: '9.0.x'
           # No solution file exists for ContosoOrdersMcpServer; using project file directly
           - solution: "Part 8 - Enhanced MCP Server/ContosoOrdersMcpServer/ContosoOrdersMcpServer.csproj"
-            dotnet-version: '8.0.x'
+            dotnet-version: '9.0.x'
 
     steps:
     - name: Checkout code

.github/workflows/dotnet-build.yml

@@ -216,6 +216,9 @@ csx/
 ecf/
 rcf/
 
+# Azure Developer CLI (azd) environment files
+.azure/
+
 # Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/

.gitignore

@@ -1,19 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.3.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <IsAspireHost>true</IsAspireHost>
-    <UserSecretsId>6e0ddb18-9421-4d8b-a3cc-9ddde029d949</UserSecretsId>
+    <UserSecretsId>7cb971c7-91be-4e8c-a48d-0d33a430b84f</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2" />
-    <PackageReference Include="Aspire.Hosting.Qdrant" Version="9.4.2" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.0" />
+    <PackageReference Include="Aspire.Hosting.Qdrant" Version="9.5.0" />
   </ItemGroup>
 
   <ItemGroup>

…ion/GenAiLab/GenAiLab.AppHost/Program.cs …ion/GenAiLab/GenAiLab.AppHost/AppHost.csPart 2 - Project Creation/GenAiLab/GenAiLab.AppHost/Program.cs renamed to Part 2 - Project Creation/GenAiLab/GenAiLab.AppHost/AppHost.cs Part 2 - Project Creation/GenAiLab/GenAiLab.AppHost/Program.cs renamed to Part 2 - Project Creation/GenAiLab/GenAiLab.AppHost/AppHost.cs

@@ -5,24 +5,24 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:17197;http://localhost:15107",
+      "applicationUrl": "https://localhost:17043;http://localhost:15249",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21209",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22284"
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21118",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22011"
       }
     },
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:15107",
+      "applicationUrl": "http://localhost:15249",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19167",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20071"
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19095",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20258"
       }
     }
   }

Part 2 - Project Creation/GenAiLab/GenAiLab.AppHost/GenAiLab.AppHost.csproj

@@ -10,11 +10,14 @@
 
 namespace Microsoft.Extensions.Hosting;
 
-// Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
+// Adds common Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
 // This project should be referenced by each service project in your solution.
 // To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults
 public static class Extensions
 {
+    private const string HealthEndpointPath = "/health";
+    private const string AlivenessEndpointPath = "/alive";
+
     public static TBuilder AddServiceDefaults<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
     {
         builder.ConfigureOpenTelemetry();
@@ -64,7 +67,12 @@ public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) w
             .WithTracing(tracing =>
             {
                 tracing.AddSource(builder.Environment.ApplicationName)
-                    .AddAspNetCoreInstrumentation()
+                    .AddAspNetCoreInstrumentation(tracing =>
+                        // Exclude health check requests from tracing
+                        tracing.Filter = context =>
+                            !context.Request.Path.StartsWithSegments(HealthEndpointPath)
+                            && !context.Request.Path.StartsWithSegments(AlivenessEndpointPath)
+                    )
                     // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package)
                     //.AddGrpcClientInstrumentation()
                     .AddHttpClientInstrumentation()
@@ -111,10 +119,10 @@ public static WebApplication MapDefaultEndpoints(this WebApplication app)
         if (app.Environment.IsDevelopment())
         {
             // All health checks must pass for app to be considered ready to accept traffic after starting
-            app.MapHealthChecks("/health");
+            app.MapHealthChecks(HealthEndpointPath);
 
             // Only health checks tagged with the "live" tag must pass for app to be considered alive
-            app.MapHealthChecks("/alive", new HealthCheckOptions
+            app.MapHealthChecks(AlivenessEndpointPath, new HealthCheckOptions
             {
                 Predicate = r => r.Tags.Contains("live")
             });

Part 2 - Project Creation/GenAiLab/GenAiLab.AppHost/Properties/launchSettings.json

@@ -11,7 +11,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.1" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />

Part 2 - Project Creation/GenAiLab/GenAiLab.ServiceDefaults/Extensions.cs

@@ -40,6 +40,7 @@
         Don't refer to the presence of citations; just emit these tags right at the end, with no surrounding text.
         ";
 
+    private int statefulMessageCount;
     private readonly ChatOptions chatOptions = new();
     private readonly List<ChatMessage> messages = new();
     private CancellationTokenSource? currentResponseCancellation;
@@ -49,6 +50,7 @@
 
     protected override void OnInitialized()
     {
+        statefulMessageCount = 0;
         messages.Add(new(ChatRole.System, SystemPrompt));
         chatOptions.Tools = [AIFunctionFactory.Create(SearchAsync)];
     }
@@ -66,15 +68,17 @@
         var responseText = new TextContent("");
         currentResponseMessage = new ChatMessage(ChatRole.Assistant, [responseText]);
         currentResponseCancellation = new();
-        await foreach (var update in ChatClient.GetStreamingResponseAsync([.. messages], chatOptions, currentResponseCancellation.Token))
+        await foreach (var update in ChatClient.GetStreamingResponseAsync(messages.Skip(statefulMessageCount), chatOptions, currentResponseCancellation.Token))
         {
             messages.AddMessages(update, filter: c => c is not TextContent);
             responseText.Text += update.Text;
+            chatOptions.ConversationId = update.ConversationId;
             ChatMessageItem.NotifyChanged(currentResponseMessage);
         }
 
         // Store the final response in the conversation, and begin getting suggestions
         messages.Add(currentResponseMessage!);
+        statefulMessageCount = chatOptions.ConversationId is not null ? messages.Count : 0;
         currentResponseMessage = null;
         chatSuggestions?.Update(messages);
     }
@@ -96,6 +100,8 @@
         CancelAnyCurrentResponse();
         messages.Clear();
         messages.Add(new(ChatRole.System, SystemPrompt));
+        chatOptions.ConversationId = null;
+        statefulMessageCount = 0;
         chatSuggestions?.Clear();
         await chatInput!.FocusAsync();
     }