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

Backport #6759 and disable extension code gen for C# #6760

Conversation

ObsidianMinor
Copy link
Contributor

@ObsidianMinor ObsidianMinor commented Oct 12, 2019

This fixes #6749, #6510, and #6509

(Backports #6759 into 3.10.x branch).

@ObsidianMinor
Copy link
Contributor Author

I hope I did this patch right. @jtattermusch

@ObsidianMinor ObsidianMinor force-pushed the csharp/backport-no-extension-code-gen branch from 4ccfa30 to d32e619 Compare October 18, 2019 00:29
@ObsidianMinor
Copy link
Contributor Author

Yeah, I forgot this requires removing a lot more code to make custom options work. Try running kokoro again.

Copy link
Contributor

@jtattermusch jtattermusch left a comment

Choose a reason for hiding this comment

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

LGTM.

@jtattermusch
Copy link
Contributor

@rafi-kamal can we push a new patch release after merging this?

@jtattermusch jtattermusch merged commit 501878b into protocolbuffers:3.10.x Oct 22, 2019
@rafi-kamal
Copy link
Contributor

Sure, will do.

@rafi-kamal
Copy link
Contributor

@jtattermusch I tried doing a release today, but it's blocked on https://groups.google.com/a/google.com/forum/#!topic/maven-users/XahhvcPnwfw due to a protoc error. Does C# protobuf depend on protoc? If not, then I can do a release only for C# without releasing protoc.

@ObsidianMinor
Copy link
Contributor Author

Part of the patch disables certain C# code-gen so for it to be completely effective protoc should be included.

@rafi-kamal
Copy link
Contributor

Release 3.10.1 to Nuget. I'll be OOO for a week from this afternoon so please reach out to the protobuf team if there is any problem.

On a side note, does anyone have instructions for rolling back released Nuget packages so that I can link it to our release docs?

@jtattermusch
Copy link
Contributor

The new nuget is here: https://www.nuget.org/packages/Google.Protobuf/3.10.1

Ad "rolling back" packages: there is no such thing with nuget.org. You can only mark packages as "unlisted" in nuget.org UI (= they will be still there for those who reference that version in their project, but they won't show up in search results). To unlist you just log in to www.nuget.org and mark specific package version as "unlisted".

@jtattermusch
Copy link
Contributor

@ObsidianMinor because this PR also has codegen changes, it sounds like we'll need to also pull the changes into Grpc.Tools nuget (which also bundles protoc binary) for the fix to be really effective?

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

Successfully merging this pull request may close these issues.

None yet

5 participants