1. 12 Nov, 2017 2 commits
    • Jon Skeet's avatar
      Move C#-only test protos to csharp/protos · aa77eab6
      Jon Skeet authored
      unittest_proto3 had been changed in a very backward-incompatible
      way which was never going to work with C# as it imports proto2 messages.
      
      This is now a copy of the old file, but with a package name change for
      compatibility with the remaining files in src/google/protobuf.
      
      The other moves are for files that are only used by C#.
      aa77eab6
    • Jon Skeet's avatar
      Run C# codegen when testing it · 9a9a66e7
      Jon Skeet authored
      This will cause failures if shared protos change in an incompatible
      way.
      9a9a66e7
  2. 10 Nov, 2017 1 commit
  3. 09 Nov, 2017 3 commits
  4. 06 Nov, 2017 1 commit
  5. 03 Nov, 2017 3 commits
  6. 01 Nov, 2017 1 commit
    • Jon Skeet's avatar
      Fix merging with message-valued oneof · cbe25059
      Jon Skeet authored
      If messages A and B have the same oneof case, which is a message
      type, and we merge B into A, those sub-messages should be merged.
      
      Fixes #3200.
      
      Note that I haven't regenerated all the code, as some of the protos
      have been changed, breaking generation.
      cbe25059
  7. 30 Oct, 2017 3 commits
  8. 28 Oct, 2017 2 commits
  9. 27 Oct, 2017 1 commit
  10. 26 Oct, 2017 4 commits
  11. 25 Oct, 2017 1 commit
  12. 24 Oct, 2017 3 commits
  13. 21 Oct, 2017 1 commit
  14. 20 Oct, 2017 2 commits
  15. 19 Oct, 2017 3 commits
  16. 18 Oct, 2017 9 commits