Skip to content

Centralize C# type attribute back-compat merging in TypeProvider - #11237

Closed
Jorge Rangel (jorgerangel-msft) with Copilot wants to merge 47 commits into
mainfrom
copilot/centralize-type-attribute-merging
Closed

Centralize C# type attribute back-compat merging in TypeProvider#11237
Jorge Rangel (jorgerangel-msft) with Copilot wants to merge 47 commits into
mainfrom
copilot/centralize-type-attribute-merging

Conversation

Copilot AI commented Jul 13, 2026 •
edited by jorgerangel-msft
Loading

Copy link
Copy Markdown
Contributor

Attribute back-compat merging (generated + last-contract + custom-code) was owned locally by CanonicalTypeProvider.BuildAttributes(). This moves that logic into a shared TypeProvider API so it follows the existing centralized back-compat pattern (Build*ForBackCompatibility).

Changes

  • TypeProvider: Added BuildAttributesForBackCompatibility() that:
    • restores compatible attributes from the last contract
    • merges generated (Attributes) and custom-code (CustomCodeView.Attributes) attributes,
    • filters CodeGen-specific attributes (CodeGenSuppress/CodeGenMember/CodeGenType/CodeGenSerialization) that should not be preserved,
    • deduplicates by rendered display string.
  • CanonicalTypeProvider: BuildAttributes() now delegates to the shared API instead of owning merge/dedup logic.
  • Tests: Added coverage for the merge/dedup behavior.

Because the method reads Attributes, CustomCodeView, LastContractView, and DeclarationModifiers from the provider, invoking it on the generated provider reproduces the previous merge exactly:

protected override IReadOnlyList<MethodBodyStatement> BuildAttributes()
    => _generatedTypeProvider.BuildAttributesForBackCompatibility();

Copilot AI linked an issue Jul 13, 2026 that may be closed by this pull request
Consider adding attributes to the list of supported backcompat scenarios #11232
Closed
@jorgerangel-msft
Centralize C# type attribute back-compat merging in TypeProvider
6a86f1b 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@microsoft-github-policy-service microsoft-github-policy-service Bot added the emitter:client:csharp Issue for the C# client emitter: @typespec/http-client-csharp label Jul 13, 2026
jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 13, 2026
View reviewed changes
Comment thread ...-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/CanonicalTypeProvider.cs Outdated
Comment thread ...ages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs Outdated
Comment thread ...ages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs Outdated
Copilot AI and others added 2 commits July 13, 2026 20:37
@jorgerangel-msft
Add unit test for BuildAttributesForBackCompatibility dedup
83afc6f 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
Remove redundant test constructor per review feedback
bbb6960 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
Copilot AI changed the title [WIP] Centralize type attribute back-compat merging in C# generator Centralize C# type attribute back-compat merging in TypeProvider Jul 13, 2026
Copilot AI and others added 2 commits July 13, 2026 21:03
@jorgerangel-msft
Address review: revert canonical delegation, only add new back-compat…
e5769db 
… attributes, perf

Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
Refine back-compat attribute comment and skip work for public types
4f3265a 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 13, 2026
View reviewed changes
Comment thread ...ages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs Outdated
Comment thread ...ages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs Outdated
Comment thread ...ages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs Outdated
Comment thread ...ages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/TypeProvider.cs
Comment thread ...ttp-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/TypeProviderTests.cs Outdated
@pkg-pr-new

pkg-pr-new Bot commented Jul 13, 2026 •
edited
Loading

Copy link
Copy Markdown

Open in StackBlitz

npm i https://pkg.pr.new/@typespec/http-client-csharp@11237

commit: 62d369e

@jorgerangel-msft
Address review: parameterize BuildAttributesForBackCompatibility, dro…
921c0ec 
…p internalize gating, add tests

Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
Address review: remove comment, use TestData for generated-code asser…
ff61d50 
…tions

Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
Copilot AI and others added 4 commits July 20, 2026 16:07
@jorgerangel-msft
fix(csharp): skip compiler-emitted nullable back-compat attributes
ebb03cd 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
test(csharp): make nullable-attribute regression test synchronous
f75b318 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
test(csharp): harden nullable attribute regression test
7df2cfa 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
style(csharp): use named args in nullable test helper
aef2904 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
Copilot AI and others added 2 commits July 20, 2026 16:16
@jorgerangel-msft
fix(csharp): use nameof for nullable back-compat filters
54f46e0 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
test: inline single-use attribute type setup
c8f686a 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft

Jorge Rangel (jorgerangel-msft) commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Copilot pull latest main

Merge remote-tracking branch 'origin/main' into copilot/centralize-ty…
db06b4a 
…pe-attribute-merging

Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>

Copilot AI commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

Copilot pull latest main

Addressed in db06b4a1. I pulled the latest main into this branch, validated the http-client-csharp build, reran the targeted TypeProviderTests and ScmModelProviderTests, and npm run cop passed.

jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 23, 2026
View reviewed changes

@jorgerangel-msft Jorge Rangel (jorgerangel-msft) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot pull latest main and address merge conflicts

Closed
@jorgerangel-msft
Merge remote-tracking branch 'origin/main' into copilot/centralize-ty…
03978c0 
…pe-attribute-merging

# Conflicts:
#	packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs
#	packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/TestHelpers/MockHelpers.cs

Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>

Copilot AI commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

Copilot pull latest main and address merge conflicts

Addressed in 03978c040. I pulled the latest main, resolved the merge conflicts in ModelReaderWriterContextDefinition.cs and MockHelpers.cs, and revalidated with npm run build, both generator test suites, and npm run cop.

@jorgerangel-msft
refactor(csharp): limit type attribute back-compat to MRW buildables
ad8cd13 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 23, 2026
View reviewed changes
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs Outdated
Comment thread ...-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmModelProvider.cs
Comment thread ....Generator.ClientModel/test/Providers/Definitions/ModelReaderWriterContextDefinitionTests.cs
Comment thread ...tp-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/CodeGenAttributes.cs Outdated
Comment thread ...ttp-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Providers/TypeProviderTests.cs Outdated
@jorgerangel-msft
fix(csharp): simplify MRW buildable attr restoration
72befe2 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 23, 2026
View reviewed changes
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs Outdated
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs Outdated
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs Outdated
Comment thread ....Generator.ClientModel/test/Providers/Definitions/ModelReaderWriterContextDefinitionTests.cs Outdated
Comment thread ...tp-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/CodeGenAttributes.cs Outdated
@jorgerangel-msft
fix(csharp): simplify MRW buildable attribute back-compat
8dba384 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 23, 2026
View reviewed changes
Comment thread ...tp-client-csharp/generator/Microsoft.TypeSpec.Generator/src/SourceInput/CodeGenAttributes.cs Outdated
{
public static class CodeGenAttributes
{
public const string CodeGenAttributePrefix = "CodeGen";

@jorgerangel-msft Jorge Rangel (jorgerangel-msft) Jul 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot why do we still have this? Remove this change and all of the obsolete code we have

Comment thread .../test/Statements/TestData/AttributeStatementTests/AttributeStatementWithIntegralArguments.cs Outdated
@jorgerangel-msft
fix(csharp): simplify MRW buildable back-compat restore
29d2e1b 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
jorgerangel-msft
Jorge Rangel (jorgerangel-msft) reviewed Jul 23, 2026
View reviewed changes
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs Outdated
Comment thread ...Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ModelReaderWriterContextDefinition.cs
Comment thread packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Writers/CodeWriter.cs Outdated
Copilot AI and others added 3 commits July 23, 2026 21:35
@jorgerangel-msft
fix(csharp): simplify MRW buildable attribute restore
07927f9 
Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>
@jorgerangel-msft
Merge branch 'main' of https://github.com/microsoft/typespec into cop…
244b676 
…ilot/centralize-type-attribute-merging
@jorgerangel-msft
fixes
62d369e
@github-actions

github-actions Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

No changes needing a change description found.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@jorgerangel-msft Jorge Rangel (jorgerangel-msft) Awaiting requested review from jorgerangel-msft jorgerangel-msft is a code owner
@m-nash m-nash Awaiting requested review from m-nash m-nash will be requested when the pull request is marked ready for review m-nash is a code owner
@JoshLove-msft JoshLove-msft Awaiting requested review from JoshLove-msft JoshLove-msft will be requested when the pull request is marked ready for review JoshLove-msft is a code owner
@jsquire Jesse Squire (jsquire) Awaiting requested review from jsquire jsquire will be requested when the pull request is marked ready for review jsquire is a code owner
@joseharriaga Jose Arriaga Maldonado (joseharriaga) Awaiting requested review from joseharriaga joseharriaga will be requested when the pull request is marked ready for review joseharriaga is a code owner

Assignees

@jorgerangel-msft Jorge Rangel (jorgerangel-msft)

Copilot code review Copilot

Labels

emitter:client:csharp Issue for the C# client emitter: @typespec/http-client-csharp

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Consider adding attributes to the list of supported backcompat scenarios

3 participants

@jorgerangel-msft