Jan Tattermusch 9d6969bec4 Merge remote-tracking branch 'upstream/master' into protobuf_buffer_serialization 5 tahun lalu
..
Conformance.cs 125e4ad267 regenerate C# protos 5 tahun lalu
Google.Protobuf.Conformance.csproj 15fab9109d Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 (#5838) 7 tahun lalu
Program.cs 1dae8fdd62 Add support for proto2 JSON parsing in C# conformance tests 5 tahun lalu