-
Notifications
You must be signed in to change notification settings - Fork 334
Fix duplicate discriminator property in derived types with matching serialized names #9477
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
Open
Copilot
wants to merge
6
commits into
main
Choose a base branch
from
copilot/fix-duplicate-odata-type-property
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
…ialized names When a derived model has a discriminator property with a different C# name but the same serialized name as the base model's discriminator, the property was incorrectly being generated in the derived class, causing CS0108 "hides inherited member" warnings. The fix adds a check for serialized names in addition to C# property names when determining if a discriminator property should be skipped in derived types. Co-authored-by: JonathanCrd <17486462+JonathanCrd@users.noreply.github.com>
…iltering Co-authored-by: JonathanCrd <17486462+JonathanCrd@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix duplicate OdataType property in derived types
Fix duplicate discriminator property in derived types with matching serialized names
Jan 27, 2026
Contributor
|
No changes needing a change description found. |
JonathanCrd
reviewed
Jan 28, 2026
...ges/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: JonathanCrd <17486462+JonathanCrd@users.noreply.github.com>
jorgerangel-msft
approved these changes
Jan 29, 2026
Contributor
jorgerangel-msft
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
...p/generator/Microsoft.TypeSpec.Generator/test/Providers/ModelProviders/DiscriminatorTests.cs
Show resolved
Hide resolved
Contributor
|
@JonathanCrd can we verify this fixes the issue in the Search library by running the Add-Debug-Profile script? |
…in tests Co-authored-by: JonathanCrd <17486462+JonathanCrd@users.noreply.github.com>
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.
Root Cause Analysis
The bug occurs in
ModelProvider.BuildProperties()where the check for duplicate discriminator properties only compared by C# property name (property.Name) instead of also checking the serialized name (property.SerializedName).When the base model has a discriminator property with a different C# name than the derived model's discriminator property (but the same wire name like
@odata.type), the check failed and the discriminator property was incorrectly added to the derived class.Fix
Added a HashSet of base discriminator serialized names and extended the check to skip discriminator properties that match by either:
Added null checks for
SerializedNameas per code review feedback to ensure defensive coding practices.Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.