-
Notifications
You must be signed in to change notification settings - Fork 379
Use CDN URL instead of blob in FindDotNetCliPackage #16340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
+1
−1
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
3 tasks
mmitche
approved these changes
Nov 24, 2025
Member
|
/backport to release/10.0 |
Member
|
/backport to release/9.0 |
Contributor
|
Started backporting to |
Member
|
/backport to release/8.0 |
Contributor
|
Started backporting to |
Contributor
|
Started backporting to |
Contributor
|
@mmitche backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Use CDN URL instead of blob in FindDotNetCliPackage
Using index info to reconstruct a base tree...
M src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.cs
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Helix/Sdk/FindDotNetCliPackage.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 set advice.mergeConflict false"
Patch failed at 0001 Use CDN URL instead of blob in FindDotNetCliPackage
Error: The process '/usr/bin/git' failed with exit code 128 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Noticed this while looking at #16329, I think we shouldn't use the blob storage here either.
To double check: