dotnet / aspire

An opinionated, cloud ready stack for building observable, production ready, distributed applications in .NET
https://learn.microsoft.com/dotnet/aspire
MIT License
2.99k stars 283 forks source link

Rename WithContainerRunArgs to WithContainerRuntimeArgs to reduce potential confusion #3950

Closed danegsta closed 2 weeks ago

danegsta commented 2 weeks ago

The original API name was confusing users (see #3944); renaming to try to reduce confusion since this is intended to be an advanced scenario.

Microsoft Reviewers: Open in CodeFlow
danegsta commented 2 weeks ago

/backport to release/8.0

github-actions[bot] commented 2 weeks ago

Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8836864299

github-actions[bot] commented 2 weeks ago

@danegsta backporting to release/8.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Rename WithContainerRunArgs to WithContainerHostRunArgs to reduce potential confusion
Using index info to reconstruct a base tree...
M   src/Aspire.Hosting/Dcp/ApplicationExecutor.cs
M   tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
M   tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs
Falling back to patching base and 3-way merge...
Auto-merging tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs
CONFLICT (content): Merge conflict in tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs
Auto-merging tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
Auto-merging src/Aspire.Hosting/Dcp/ApplicationExecutor.cs
CONFLICT (content): Merge conflict in src/Aspire.Hosting/Dcp/ApplicationExecutor.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Rename WithContainerRunArgs to WithContainerHostRunArgs to reduce potential confusion
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 2 weeks ago

@danegsta an error occurred while backporting to release/8.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.