Fix build

Author: JamesNK

src/Aspire.Hosting/IInteractionService.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Aspire.Hosting;
@@ -108,7 +109,7 @@ public sealed class InteractionInput
     /// Gets or sets the name for the input. Used for accessing inputs by name from a keyed collection.
     /// If not specified, a name will be generated automatically.
     /// </summary>
-    public string? Name { get; init; }
+    public string? Name { get; internal set; }
 
     /// <summary>
     /// Gets or sets the label for the input.
@@ -175,6 +176,7 @@ public int? MaxLength
 /// A collection of interaction inputs that supports both indexed and name-based access.
 /// </summary>
 [Experimental(InteractionService.DiagnosticId, UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
+[DebuggerDisplay("Count = {Count}")]
 public sealed class InteractionInputCollection : IReadOnlyList<InteractionInput>
 {
     private readonly IReadOnlyList<InteractionInput> _inputs;
@@ -190,7 +192,7 @@ public InteractionInputCollection(IReadOnlyList<InteractionInput> inputs)
         var processedInputs = new List<InteractionInput>();
         var inputsByName = new Dictionary<string, InteractionInput>(StringComparer.OrdinalIgnoreCase);
         var usedNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        
+
         // First pass: collect explicit names and check for duplicates
         foreach (var input in inputs)
         {
@@ -203,53 +205,39 @@ public InteractionInputCollection(IReadOnlyList<InteractionInput> inputs)
                 usedNames.Add(input.Name);
             }
         }
-        
+
         // Second pass: create new inputs with generated names where needed
-        for (int i = 0; i < inputs.Count; i++)
+        for (var i = 0; i < inputs.Count; i++)
         {
             var input = inputs[i];
             string finalName;
-            
+
             if (!string.IsNullOrWhiteSpace(input.Name))
             {
                 finalName = input.Name;
             }
             else
             {
                 // Generate a unique name based on the label or index
-                string baseName = GenerateBaseName(input.Label);
+                var baseName = GenerateBaseName(input.Label);
                 finalName = baseName;
-                int suffix = 1;
-                
+                var suffix = 1;
+
                 while (usedNames.Contains(finalName))
                 {
                     finalName = $"{baseName}_{suffix}";
                     suffix++;
                 }
-                
+
                 usedNames.Add(finalName);
+
+                input.Name = finalName;
             }
-            
-            // Create a new input with the final name if it was generated
-            var finalInput = string.IsNullOrWhiteSpace(input.Name) ? 
-                new InteractionInput
-                {
-                    Name = finalName,
-                    Label = input.Label,
-                    Description = input.Description,
-                    EnableDescriptionMarkdown = input.EnableDescriptionMarkdown,
-                    InputType = input.InputType,
-                    Required = input.Required,
-                    Options = input.Options,
-                    Value = input.Value,
-                    Placeholder = input.Placeholder,
-                    MaxLength = input.MaxLength
-                } : input;
-            
-            processedInputs.Add(finalInput);
-            inputsByName[finalName] = finalInput;
+
+            processedInputs.Add(input);
+            inputsByName[finalName] = input;
         }
-        
+
         _inputs = processedInputs;
         _inputsByName = inputsByName;
     }
@@ -260,14 +248,14 @@ private static string GenerateBaseName(string label)
         {
             return "Input";
         }
-        
+
         // Convert to a valid identifier-like name
         var chars = label.ToCharArray();
         var result = new System.Text.StringBuilder();
-        
-        for (int i = 0; i < chars.Length; i++)
+
+        for (var i = 0; i < chars.Length; i++)
         {
-            char c = chars[i];
+            var c = chars[i];
             if (char.IsLetterOrDigit(c))
             {
                 result.Append(c);
@@ -277,9 +265,9 @@ private static string GenerateBaseName(string label)
                 result.Append('_');
             }
         }
-        
+
         // Ensure we have a valid name
-        string name = result.ToString().Trim('_');
+        var name = result.ToString().Trim('_');
         return string.IsNullOrEmpty(name) ? "Input" : name;
     }
 

tests/Shared/TestInteractionService.cs

@@ -7,7 +7,7 @@
 
 namespace Aspire.Hosting.Tests;
 
-internal sealed record InteractionData(string Title, string? Message, IReadOnlyList<InteractionInput> Inputs, InteractionOptions? Options, TaskCompletionSource<object> CompletionTcs);
+internal sealed record InteractionData(string Title, string? Message, InteractionInputCollection Inputs, InteractionOptions? Options, TaskCompletionSource<object> CompletionTcs);
 
 internal sealed class TestInteractionService : IInteractionService
 {
@@ -32,7 +32,7 @@ public Task<InteractionResult<InteractionInput>> PromptInputAsync(string title,
 
     public async Task<InteractionResult<InteractionInputCollection>> PromptInputsAsync(string title, string? message, IReadOnlyList<InteractionInput> inputs, InputsDialogInteractionOptions? options = null, CancellationToken cancellationToken = default)
     {
-        var data = new InteractionData(title, message, inputs, options, new TaskCompletionSource<object>());
+        var data = new InteractionData(title, message, new InteractionInputCollection(inputs), options, new TaskCompletionSource<object>());
         Interactions.Writer.TryWrite(data);
         var result = (InteractionResult<IReadOnlyList<InteractionInput>>)await data.CompletionTcs.Task;
 
@@ -47,7 +47,7 @@ public async Task<InteractionResult<InteractionInputCollection>> PromptInputsAsy
 
     public async Task<InteractionResult<bool>> PromptNotificationAsync(string title, string message, NotificationInteractionOptions? options = null, CancellationToken cancellationToken = default)
     {
-        var data = new InteractionData(title, message, [], options, new TaskCompletionSource<object>());
+        var data = new InteractionData(title, message, new InteractionInputCollection([]), options, new TaskCompletionSource<object>());
         Interactions.Writer.TryWrite(data);
         return (InteractionResult<bool>)await data.CompletionTcs.Task;
     }