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

Move to Azure.Provisioning.* GA packages. #3983

Closed mitchdenny closed 2 weeks ago

mitchdenny commented 2 weeks ago

Moves to Azure.Provisioning@0.2.0 and Azure.Provisioning.*@0.1.0 except for Azure.Provisioning.ApplicationInsights which is still stuck at 0.1.0-beta.1 because the Azure.ResourceManager.ApplicationInsights package has never shipped at GA (will be addressed next week).

Microsoft Reviewers: Open in CodeFlow
mitchdenny 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/8857141897

github-actions[bot] commented 2 weeks ago

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

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

Applying: Move to Azure.Provisioning.* GA packages.
Using index info to reconstruct a base tree...
M   Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move to Azure.Provisioning.* GA packages.
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

@mitchdenny 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.

mitchdenny 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/8857743659

github-actions[bot] commented 2 weeks ago

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

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

Applying: Move to Azure.Provisioning.* GA packages.
Using index info to reconstruct a base tree...
M   Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move to Azure.Provisioning.* GA packages.
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

@mitchdenny 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.