Repository navigation
Fix main build broken by bad merge-conflict resolution - #36
Open
bhillkeyfactor wants to merge 2 commits into
Open
bhillkeyfactor wants to merge 2 commits into
bhillkeyfactor wants to merge 2 commits into
Conversation
A "Merge branch 'main' into release-2.0" commit mangled RequestManager's
GetCertificateType into a truncated method (missing body/closing brace,
swallowing the next method's signature), and dropped the
MultiNameCertificateTypes/EvCertificateTypes lookup sets it depends on.
That broken state then flowed into main via the 2.0.2 merge. The actual
published 2.0.2 release tag predates this and is unaffected.
Also fixes a test file truncated by the same bad merge (a test body cut
off mid-assertion, swallowing the next test's attribute/signature), two
tests using the wrong ("TrustedSecure" vs "Trusted Secure") spelling for
two legacy product names, and removes a stale duplicate GetProductIds
test left over from before the product rename.
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 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.
A "Merge branch 'main' into release-2.0" commit mangled
RequestManager.GetCertificateTypeinto a truncated method (missing body/closing brace, swallowing the next method's signature), and dropped theMultiNameCertificateTypes/EvCertificateTypeslookup sets it depends on. That broken state then flowed intomainvia the 2.0.2 merge.The actual published
2.0.2release tag predates this and is unaffected - it points at the clean merge commit from PR #34, not the later bad merge. So no customer impact, butmain's current tip does not compile, and anything branched off it inherits that.Also fixes a test file truncated by the same bad merge (a test body cut off mid-assertion, swallowing the next test's attribute/signature), two tests using the wrong (
TrustedSecurevsTrusted Secure) spelling for two legacy product names, and removes a stale duplicateGetProductIdstest left over from before the product rename.Test plan
dotnet build- 0 errorsdotnet test- 206/206 passing