Update NuGet and Docker dependencies #5575
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotnet-issue-labeler
bot
added
the
needs-area-label
sebastienros
reviewed
Sep 6, 2024
sebastienros
reviewed
Sep 6, 2024
| @@ -7,6 +7,6 @@ internal static class ElasticsearchContainerImageTags | |||
| { | |||
| public const string Registry = "docker.io"; | |||
| public const string Image = "library/elasticsearch"; | |||
| public const string Tag = "8.15.0"; | |||
| public const string Tag = "8.15.1"; | |||
There was a problem hiding this comment.
Correct, we need to update the registry. I was going to take care of it but if you're planning on doing it then that works for me too.
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
eerhardt
approved these changes
Sep 7, 2024
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/backport to release/8.2 |
|
Started backporting to release/8.2: https://github.com/dotnet/aspire/actions/runs/10855903601 |
|
@joperezr backporting to release/8.2 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update NuGet and Docker dependencies
Using index info to reconstruct a base tree...
M Directory.Packages.props
M eng/Version.Details.xml
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Version.Details.xml
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
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update NuGet and Docker dependencies
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@joperezr an error occurred while backporting to release/8.2, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
@joperezr - were you planning on backporting this change to release/8.2? |
joperezr
added a commit
to joperezr/aspire
that referenced
this pull request
Sep 19, 2024
* Update NuGet and Docker dependencies * Update cgmanifest.json file * Update ConfigurationSchema.json files * Revert FluentUI updates as there were test failures here --------- Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
joperezr
added a commit
that referenced
this pull request
Sep 20, 2024
* Update NuGet and Docker dependencies * Update cgmanifest.json file * Update ConfigurationSchema.json files * Revert FluentUI updates as there were test failures here --------- Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Updating dependencies from NuGet and Docker.
Checklist
<remarks />and<code />elements on your triple slash comments?Microsoft Reviewers: Open in CodeFlow