Fix System.Formats.Asn1 CG alert#5863
Merged
eerhardt merged 1 commit intomicrosoft:mainfrom Sep 25, 2024
Merged
Conversation
sebastienros
approved these changes
Sep 23, 2024
Open
3 tasks
joperezr
reviewed
Sep 24, 2024
| <PackageVersion Include="Azure.Identity" Version="1.12.0" /> | ||
| <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> | ||
| <!-- https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3313 --> | ||
| <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> |
Member
There was a problem hiding this comment.
Is the comment above still accurate?
Member
Author
There was a problem hiding this comment.
Yes - that is the reason why we need to "lift" Newtonsoft.Json - because of CosmosDB.
joperezr
approved these changes
Sep 24, 2024
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Member
|
/backport to release/8.2 |
Contributor
|
Started backporting to release/8.2: https://github.com/dotnet/aspire/actions/runs/11077661241 |
Contributor
|
@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: Fix System.Formats.Asn1 CG alert
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
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 Fix System.Formats.Asn1 CG alert
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@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. |
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
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
System.Formats.Asn1
6.0.0and8.0.0have security vulnerabilities. See CVE-2024-38095.Updating to
8.0.1to fix these.Microsoft Reviewers: Open in CodeFlow