Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/Aspire.Cli/Aspire.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@
</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>
Expand Down Expand Up @@ -273,10 +268,6 @@


<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>
Expand Down
19 changes: 0 additions & 19 deletions src/Aspire.Cli/Backchannel/AppHostCliBackchannel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ internal interface IAppHostCliBackchannel
Task<string[]> GetCapabilitiesAsync(CancellationToken cancellationToken);
Task CompletePromptResponseAsync(string promptId, PublishingPromptInputAnswer[] answers, CancellationToken cancellationToken);
Task UpdatePromptResponseAsync(string promptId, PublishingPromptInputAnswer[] answers, CancellationToken cancellationToken);
IAsyncEnumerable<CommandOutput> ExecAsync(CancellationToken cancellationToken);
Task<GetPipelineStepsResponse> GetPipelineStepsAsync(string? step, CancellationToken cancellationToken);
}

Expand Down Expand Up @@ -477,24 +476,6 @@ await rpc.InvokeWithCancellationAsync(
cancellationToken).ConfigureAwait(false);
}

public async IAsyncEnumerable<CommandOutput> ExecAsync([EnumeratorCancellation] CancellationToken cancellationToken)
{
using var activity = telemetry.StartDiagnosticActivity();
var rpc = await GetRpcTaskAsync().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;
}
}

public async Task<GetPipelineStepsResponse> GetPipelineStepsAsync(string? step, CancellationToken cancellationToken)
{
using var activity = telemetry.StartDiagnosticActivity();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ namespace Aspire.Cli.Backchannel;
[JsonSerializable(typeof(IEnumerable<DisplayLineState>))]
[JsonSerializable(typeof(PublishingPromptInputAnswer[]))]
[JsonSerializable(typeof(ValidationResult))]
[JsonSerializable(typeof(IAsyncEnumerable<CommandOutput>))]
[JsonSerializable(typeof(MessageFormatterEnumerableTracker.EnumeratorResults<CommandOutput>))]
[JsonSerializable(typeof(EnvVar))]
[JsonSerializable(typeof(List<EnvVar>))]
[JsonSerializable(typeof(List<string>))]
Expand Down
Loading
Loading