feat: aspire exec 2

playground/DatabaseMigration/DatabaseMigration.ApiModel/DatabaseMigration.ApiModel.csproj

@@ -10,7 +10,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
+
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
   </ItemGroup>
 
 </Project>

playground/DatabaseMigration/DatabaseMigration.ApiModel/Migrations/MyDb1ContextModelSnapshot.cs

@@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("ProductVersion", "8.0.17")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -27,6 +27,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
                     b.HasKey("Id");
 
                     b.ToTable("Entries");

playground/DatabaseMigration/DatabaseMigration.ApiModel/MyDb1Context.cs

@@ -11,4 +11,6 @@ public class MyDb1Context(DbContextOptions<MyDb1Context> options) : DbContext(op
 public class Entry
 {
     public Guid Id { get; set; } = Guid.NewGuid();
+
+    public long Version { get; set; } = 1;
 }

playground/DatabaseMigration/DatabaseMigration.ApiService/DatabaseMigration.ApiService.csproj

@@ -5,11 +5,15 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" />
     <ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
     <ProjectReference Include="..\DatabaseMigration.ApiModel\DatabaseMigration.ApiModel.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+  </ItemGroup>
+
 </Project>

playground/DatabaseMigration/DatabaseMigration.ApiService/Program.cs

@@ -7,13 +7,27 @@
 
 builder.AddServiceDefaults();
 
-builder.AddSqlServerDbContext<MyDb1Context>("db1", configureDbContextOptions: options =>
+if (args.Contains("--postgres"))
 {
-    options.UseSqlServer(sqlServerOptions =>
+    builder.Services.AddDbContextPool<MyDb1Context>(options =>
     {
-        sqlServerOptions.MigrationsAssembly("DatabaseMigration.ApiModel");
+        var connectionString = builder.Configuration.GetConnectionString("db1");
+        options.UseNpgsql(connectionString, options =>
+        {
+            options.MigrationsAssembly("DatabaseMigration.ApiModel");
+        });
     });
-});
+}
+else
+{
+    builder.AddSqlServerDbContext<MyDb1Context>("db1", configureDbContextOptions: options =>
+    {
+        options.UseSqlServer(sqlServerOptions =>
+        {
+            sqlServerOptions.MigrationsAssembly("DatabaseMigration.ApiModel");
+        });
+    });
+}
 
 var app = builder.Build();
 

playground/DatabaseMigration/DatabaseMigration.AppHost/DatabaseMigration.AppHost.csproj

@@ -15,6 +15,8 @@
   <ItemGroup>
     <AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.SqlServer" />
+    <AspireProjectOrPackageReference Include="Aspire.Hosting.PostgreSQL" />
+    <AspireProjectOrPackageReference Include="Aspire.Hosting.MySql" />
 
     <ProjectReference Include="..\DatabaseMigration.ApiService\DatabaseMigration.ApiService.csproj" />
     <ProjectReference Include="..\DatabaseMigration.MigrationService\DatabaseMigration.MigrationService.csproj" />

playground/DatabaseMigration/DatabaseMigration.AppHost/Program.cs

@@ -3,14 +3,23 @@
 
 var builder = DistributedApplication.CreateBuilder(args);
 
-var db1 = builder.AddSqlServer("sql1").AddDatabase("db1");
+IResourceBuilder<IResourceWithConnectionString> database;
+
+if (args.Contains("--postgres"))
+{
+    database = builder.AddPostgres("sql1").AddDatabase("db1");
+}
+else
+{
+    database = builder.AddSqlServer("sql1").AddDatabase("db1");
+}
 
 builder.AddProject<Projects.DatabaseMigration_ApiService>("api")
        .WithExternalHttpEndpoints()
-       .WithReference(db1);
+       .WithReference(database);
 
 builder.AddProject<Projects.DatabaseMigration_MigrationService>("migration")
-       .WithReference(db1);
+       .WithReference(database);
 
 #if !SKIP_DASHBOARD_REFERENCE
 // This project is only added in playground projects to support development/debugging

src/Aspire.Cli/Aspire.Cli.csproj

@@ -55,6 +55,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Resources\ExecCommandStrings.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ExecCommandStrings.resx</DependentUpon>
+    </Compile>
     <Compile Update="Resources\InteractionServiceStrings.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -108,6 +113,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Resources\ExecCommandStrings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ExecCommandStrings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\InteractionServiceStrings.resx">
       <XlfSourceFormat>Resx</XlfSourceFormat>
       <XlfOutputItem>EmbeddedResource</XlfOutputItem>

src/Aspire.Cli/Backchannel/AppHostBackchannel.cs

@@ -22,6 +22,7 @@ internal interface IAppHostBackchannel
     IAsyncEnumerable<PublishingActivity> GetPublishingActivitiesAsync(CancellationToken cancellationToken);
     Task<string[]> GetCapabilitiesAsync(CancellationToken cancellationToken);
     Task CompletePromptResponseAsync(string promptId, string?[] answers, CancellationToken cancellationToken);
+    IAsyncEnumerable<CommandOutput> ExecAsync(CancellationToken cancellationToken);
 }
 
 internal sealed class AppHostBackchannel(ILogger<AppHostBackchannel> logger, AspireCliTelemetry telemetry) : IAppHostBackchannel
@@ -32,8 +33,7 @@ internal sealed class AppHostBackchannel(ILogger<AppHostBackchannel> logger, Asp
     public async Task<long> PingAsync(long timestamp, CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task;
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Sent ping with timestamp {Timestamp}", timestamp);
 
@@ -52,8 +52,7 @@ public async Task RequestStopAsync(CancellationToken cancellationToken)
         // which will allow the CLI to await the pending run.
 
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task;
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Requesting stop");
 
@@ -66,8 +65,7 @@ await rpc.InvokeWithCancellationAsync(
     public async Task<(string BaseUrlWithLoginToken, string? CodespacesUrlWithLoginToken)> GetDashboardUrlsAsync(CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task;
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Requesting dashboard URL");
 
@@ -82,8 +80,7 @@ await rpc.InvokeWithCancellationAsync(
     public async IAsyncEnumerable<BackchannelLogEntry> GetAppHostLogEntriesAsync([EnumeratorCancellation] CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task;
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Requesting AppHost log entries");
 
@@ -103,8 +100,7 @@ public async IAsyncEnumerable<BackchannelLogEntry> GetAppHostLogEntriesAsync([En
     public async IAsyncEnumerable<RpcResourceState> GetResourceStatesAsync([EnumeratorCancellation] CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task;
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Requesting resource states");
 
@@ -170,8 +166,7 @@ public async Task ConnectAsync(string socketPath, CancellationToken cancellation
     public async IAsyncEnumerable<PublishingActivity> GetPublishingActivitiesAsync([EnumeratorCancellation] CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task;
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Requesting publishing activities.");
 
@@ -191,8 +186,7 @@ public async IAsyncEnumerable<PublishingActivity> GetPublishingActivitiesAsync([
     public async Task<string[]> GetCapabilitiesAsync(CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task.ConfigureAwait(false);
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Requesting capabilities");
 
@@ -207,8 +201,7 @@ public async Task<string[]> GetCapabilitiesAsync(CancellationToken cancellationT
     public async Task CompletePromptResponseAsync(string promptId, string?[] answers, CancellationToken cancellationToken)
     {
         using var activity = telemetry.ActivitySource.StartActivity();
-
-        var rpc = await _rpcTaskCompletionSource.Task.ConfigureAwait(false);
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
         logger.LogDebug("Providing prompt responses for prompt ID {PromptId}", promptId);
 
@@ -217,5 +210,23 @@ await rpc.InvokeWithCancellationAsync(
             [promptId, answers],
             cancellationToken).ConfigureAwait(false);
     }
+
+    public async IAsyncEnumerable<CommandOutput> ExecAsync([EnumeratorCancellation] CancellationToken cancellationToken)
+    {
+        using var activity = telemetry.ActivitySource.StartActivity();
+        var rpc = await _rpcTaskCompletionSource.Task.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        logger.LogDebug("Requesting execution.");
+        var commandOutputs = await rpc.InvokeWithCancellationAsync<IAsyncEnumerable<CommandOutput>>(
+            "ExecAsync",
+            Array.Empty<object>(),
+            cancellationToken);
+
+        logger.LogDebug("Requested execution.");
+        await foreach (var commandOutput in commandOutputs.WithCancellation(cancellationToken))
+        {
+            yield return commandOutput;
+        }
+    }
 }
 

src/Aspire.Cli/Backchannel/BackchannelJsonSerializerContext.cs

@@ -24,6 +24,8 @@ namespace Aspire.Cli.Backchannel;
 [JsonSerializable(typeof(RequestId))]
 [JsonSerializable(typeof(IEnumerable<DisplayLineState>))]
 [JsonSerializable(typeof(ValidationResult))]
+[JsonSerializable(typeof(IAsyncEnumerable<CommandOutput>))]
+[JsonSerializable(typeof(MessageFormatterEnumerableTracker.EnumeratorResults<CommandOutput>))]
 internal partial class BackchannelJsonSerializerContext : JsonSerializerContext
 {
     [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Using the Json source generator.")]