Remove Milvus.Client dependency. #6435
Merged
Conversation
This file contains hidden or 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
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11469724726 |
eerhardt
reviewed
Oct 22, 2024
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11470499191 |
|
@mitchdenny backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove Milvus.Client dependency.
Applying: namespaces!
Using index info to reconstruct a base tree...
M src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs
M src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs
CONFLICT (content): Merge conflict in src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs
Auto-merging src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs
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 0002 namespaces!
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@mitchdenny an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
eerhardt
approved these changes
Oct 23, 2024
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11476514204 |
|
@mitchdenny backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove Milvus.Client dependency.
Applying: namespaces!
error: sha1 information is lacking or useless (src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs).
error: could not build fake ancestor
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 0002 namespaces!
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@mitchdenny an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
mitchdenny
added a commit
that referenced
this pull request
Oct 23, 2024
* Remove Milvus.Client dependency. * namespaces! * Fix random change.
|
We should log an issue for Adding the health check to Milvus. |
eerhardt
pushed a commit
that referenced
this pull request
Oct 25, 2024
* Remove Milvus.Client dependency. (#6435) * Remove Milvus.Client dependency. * namespaces! * Fix random change. * Remove Suppression of stable version in order to produce stable versions. --------- Co-authored-by: Jose Perez Rodriguez <[email protected]>
joperezr
added a commit
to joperezr/aspire
that referenced
this pull request
Nov 13, 2024
…/9.0 #### AI description (iteration 1) #### PR Classification Code cleanup and dependency updates. #### PR Summary This pull request merges changes from `release/9.0` into `internal/release/9.0`, addressing several work items related to security, dependency updates, and code cleanup. - Removed `MilvusClient` creation logic and health checks from `src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs`. - Updated various package dependencies in `Directory.Packages.props` and `eng/Version.Details.xml`. - Added `AssemblyInfo.cs` to `src/Aspire.Hosting.Python` to mark it as experimental. - Updated container image tags in `src/Aspire.Hosting.Milvus`, `src/Aspire.Hosting.MySql`, `src/Aspire.Hosting.Elasticsearch`, and `src/Aspire.Hosting.Keycloak`. - Removed deprecated package references and suppressed final package version in `src/Aspire.Hosting.Milvus/Aspire.Hosting.Milvus.csproj`. Related work items: dotnet#5994, dotnet#6054, dotnet#6298, dotnet#6377, dotnet#6417, dotnet#6435, dotnet#6451, dotnet#6460, dotnet#6498
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
Removing Milvus client dependency (incl health check) so we can ship the hosting package as GA.
Fixes #6431
Checklist
<remarks />and<code />elements on your triple slash comments?Microsoft Reviewers: Open in CodeFlow