Bugfixes/12952 fix newtonsoft using #15515
Merged
Conversation
This file contains 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
Next commit will have all modified samples.
JFCote
commented
May 15, 2023
| @@ -5,8 +5,8 @@ | |||
| {{#description}} | |||
| /// <value>{{{.}}}</value> | |||
| {{/description}} | |||
| {{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}[TypeConverter(typeof(CustomEnumConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}>))] | |||
| [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]{{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}} | |||
| {{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}{{#useNewtonsoft}}[TypeConverter(typeof(CustomEnumConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}>))] | |||
There was a problem hiding this comment.
Here is where I'm not sure how to handle without newtonsoft. Right now, I simply remove it completely and it compiles and all test pass. Not sure if it has other consequences, so feedback and confirmation would be appreciated.
JFCote
commented
May 15, 2023
| @@ -28,7 +33,7 @@ namespace {{modelPackage}} | |||
| /// </summary> | |||
| [DataContract] | |||
| {{#discriminator}} | |||
| [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")] | |||
| {{#useNewtonsoft}}[JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]{{/useNewtonsoft}} | |||
There was a problem hiding this comment.
Same thing here, just not there without newtonsoft. Feedback is welcome
|
Thanks for the PR. Tested locally and the new sample built without issues. |
6 tasks
|
FYI. Filed #15518 with some minor enhancements. |
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.
This fix #12952. We had warning / errors in our generated code because of this and saw this open bug so decided to do the required work.
Feedback welcome!
Technical committee: @mandrean (2017/08) @frankyjuang (2019/09) @shibayan (2020/02) @Blackclaws (2021/03) @lucamazzanti (2021/05)
PR checklist
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.For Windows users, please run the script in Git BASH.
master(6.3.0) (minor release - breaking changes with fallbacks),7.0.x(breaking changes without fallbacks)