Skip to content

Avoid generating code for unsupported types in config source gen #94438

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 6 commits into from
Nov 9, 2023

Conversation

tarekgh
Copy link
Member

@tarekgh tarekgh commented Nov 6, 2023

@ghost ghost assigned tarekgh Nov 6, 2023
@ghost
Copy link

ghost commented Nov 6, 2023

Tagging subscribers to this area: @dotnet/area-extensions-configuration
See info in area-owners.md if you want to be subscribed.

Issue Details

#94117

Author: tarekgh
Assignees: tarekgh
Labels:

area-Extensions-Configuration

Milestone: -

@tarekgh
Copy link
Member Author

tarekgh commented Nov 6, 2023

CC @eerhardt

@tarekgh
Copy link
Member Author

tarekgh commented Nov 6, 2023

Note, this is a candidate change to port to the 8.0 servicing.

@tarekgh tarekgh added the source-generator Indicates an issue with a source generator feature label Nov 6, 2023
@tarekgh tarekgh added this to the 9.0.0 milestone Nov 6, 2023
@tarekgh
Copy link
Member Author

tarekgh commented Nov 8, 2023

@ericstj @eiriktsarpalis I believe I addressed all feedback now.

Copy link
Member

@eiriktsarpalis eiriktsarpalis left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@tarekgh
Copy link
Member Author

tarekgh commented Nov 9, 2023

/backport to release/8.0-staging

Copy link
Contributor

github-actions bot commented Nov 9, 2023

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/6815764618

Copy link
Contributor

github-actions bot commented Nov 9, 2023

@tarekgh backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Avoid generating code for unsupported types in config source gen
.git/rebase-apply/patch:404: trailing whitespace.
        
.git/rebase-apply/patch:412: trailing whitespace.
        
.git/rebase-apply/patch:444: trailing whitespace.
        
.git/rebase-apply/patch:447: trailing whitespace.
        
.git/rebase-apply/patch:452: trailing whitespace.
        
warning: squelched 10 whitespace errors
warning: 15 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/KnownTypeSymbols.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Baselines.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Baselines.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/KnownTypeSymbols.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Parser/KnownTypeSymbols.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Parser.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Avoid generating code for unsupported types in config source gen
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Nov 9, 2023

@tarekgh an error occurred while backporting to release/8.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@dotnet dotnet deleted a comment from github-actions bot Nov 9, 2023
@dotnet dotnet deleted a comment from github-actions bot Nov 9, 2023
@dotnet dotnet deleted a comment from github-actions bot Nov 9, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Dec 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Extensions-Configuration source-generator Indicates an issue with a source generator feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants