Repository navigation
Add new NuGet cert hash - #56242
Add new NuGet cert hash#56242
Conversation
The new certificate will be live soon. Add the new cert hash.
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
There was a problem hiding this comment.
🟢 Approval recommended
The focused certificate allowlist update has no unresolved review issues.
Pull request overview
Adds the upcoming Microsoft NuGet signing certificate SHA-256 thumbprint to first-party package verification.
Changes:
- Adds the new certificate hash to the trusted allowlist.
File summaries
| File | Description |
|---|---|
src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs |
Adds the new trusted certificate thumbprint. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 0
- Review effort level: Lite
|
/backport to release/11.0.1xx |
|
Started backporting to |
|
/backport to release/10.0.1xx |
|
/backport to release/10.0.4xx |
|
Started backporting to |
|
Started backporting to |
|
/backport to release/9.0.1xx |
|
Started backporting to |
|
/backport to release/8.0.1xx |
|
Started backporting to |
|
@mmitche backporting to git am output$ git cherry-pick 7487ae326d70d04b9f03042c49e8a82bd25e3077
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
error: could not apply 7487ae326d... Add new NuGet cert hash (#56242)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add new NuGet cert hash
Using index info to reconstruct a base tree...
M src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.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 Add new NuGet cert hash
Error: The process '/usr/bin/git' failed with exit code 128 |
|
@mmitche backporting to git am output$ git cherry-pick 7487ae326d70d04b9f03042c49e8a82bd25e3077
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
error: could not apply 7487ae326d... Add new NuGet cert hash (#56242)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add new NuGet cert hash
Using index info to reconstruct a base tree...
M src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.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 Add new NuGet cert hash
Error: The process '/usr/bin/git' failed with exit code 128 |
|
/backport to release/9.0.3xx |
|
/backport to release/8.0.4xx |
|
Started backporting to |
|
@mmitche backporting to git am output$ git cherry-pick 7487ae326d70d04b9f03042c49e8a82bd25e3077
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
error: could not apply 7487ae326d... Add new NuGet cert hash (#56242)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add new NuGet cert hash
Using index info to reconstruct a base tree...
M src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.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 Add new NuGet cert hash
Error: The process '/usr/bin/git' failed with exit code 128 |
|
Started backporting to |
|
@mmitche backporting to git am output$ git cherry-pick 7487ae326d70d04b9f03042c49e8a82bd25e3077
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
error: could not apply 7487ae326d... Add new NuGet cert hash (#56242)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Add new NuGet cert hash
Using index info to reconstruct a base tree...
M src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs
CONFLICT (content): Merge conflict in src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.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 Add new NuGet cert hash
Error: The process '/usr/bin/git' failed with exit code 128 |
The new certificate will be live soon. Add the new cert hash.