Conversation
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11469724726 |
|
/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
left a comment
There was a problem hiding this comment.
I think this is the right change for now. Hopefully Milvus.Client releases stable soon.
|
/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. |
* Remove Milvus.Client dependency. * namespaces! * Fix random change.
|
We should log an issue for Adding the health check to Milvus. |
* 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 <joperezr@microsoft.com>
…/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
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