Skip to content
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

OneOf Enum + Optional #912

Closed
wants to merge 0 commits into from
Closed

OneOf Enum + Optional #912

wants to merge 0 commits into from

Conversation

mmillerbe
Copy link

  • Added BuildTest for OneOfEnum + Optional field
  • Updated System.Collections.Immutable package version
  • CodeGenerator: check IsProto3OptionalSyntheticOneOf before generating OneOfEnum
  • CodeGenerator.OneOfStub: added _anyProto3Optional field; added IsProto3OptionalSyntheticOneOf method

@mgravell
Copy link
Member

I had a look - sorry for delay; I don't think we need to explicit field tracking - pretty sure we can infer that from the ambient state; see 52063df - and; locally at least, I had problems with the tests not working - unrelated to your changes; I had to fix a few things - see 16568c1

I don't think I can push to your remote; any chance you can absorb the above two, so I don't screw up credit?

@mmillerbe
Copy link
Author

Thanks very much for looking! Integrating your changes now.

@mmillerbe
Copy link
Author

Hey, I'm sorry Marc! Your changes look good to me, but I'm a little confused on how to absorb your changes. I see that you pushed to the mmillerbe-main branch of this repo, but I don't have that branch in my fork, and I'm a little confused as to how to pull it down. It's definitely fine with me if you just want to merge this as-is.

@mmillerbe
Copy link
Author

Last comment from me today, Marc! I pulled the changes you made in mmillerbe-main into the mmillerbe fork's main. Let me know if I did that incorrectly, and apologies in advance if I did!

@mgravell
Copy link
Member

mgravell commented Aug 26, 2022 via email

@mmillerbe
Copy link
Author

Thanks! Apologies if I made more work there.

Mike

@mgravell
Copy link
Member

mgravell commented Oct 11, 2022 via email

@mmillerbe
Copy link
Author

Hey Marc,

Apologies for continuing to bug you about this! Just wanted to see if there's anything I could help out with here.

Thank you!
Mike

@mmillerbe
Copy link
Author

Hey Marc,

Just wanted to bump this - any chance of getting it merged in? I'm happy to work through anything that'd make it easier.
My apologies, I don't have a ton of experience with github workflows.

Thanks again!
Mike

@mgravell
Copy link
Member

mgravell commented Mar 1, 2023

The bump is justified; I'll try to take a look - sorry for delay, but I have at least been busy in this area!

@mgravell mgravell self-assigned this Mar 1, 2023
@mmillerbe
Copy link
Author

No need to apologize - I appreciate all the work you do on this! Thanks again!

@mmillerbe
Copy link
Author

Hey Marc,

Hope you're doing well! Just wanted to check on this. Could we get this (or something like it) merged in? Or any chance this has been resolved via another change?

Thanks!

@mgravell
Copy link
Member

change looks good (sorry that I'm not keeping up); merge hell, though - might be worth yanking into a clean branch from main and cherry-pick 48cebac into that branch as a clean PR?

@mmillerbe
Copy link
Author

Thanks! I will work on getting you a clean PR

@mmillerbe
Copy link
Author

mmillerbe commented Feb 23, 2024

Hey Mark,

I created this PR #1132 just cherry-picking the commit you referenced above. I did create a few files / directories that I think might be out of date with the current directory structure. Let me know if you want me to delete or move those.

Oh, and I wasn't sure if you wanted me to also pull in 52063df that you added to avoid the field. Happy to do that as well.

Thanks again!
Mike

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants