Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #385 from cfallin/travis-refactor | Chris Fallin | 2015-05-14 | 3 | -20/+172 |
|\ | | | | | Refactor Travis tests: split configs and run in parallel. | ||||
| * | Refactor Travis tests: split configs and run in parallel. | Chris Fallin | 2015-05-14 | 3 | -20/+172 |
| | | |||||
* | | Merge pull request #384 from google/csharp | Jie Luo | 2015-05-14 | 314 | -55/+267908 |
|\ \ | | | | | | | Merge protobuf C# into master (only C# proto2 is supported) | ||||
| * \ | Merge pull request #382 from jtattermusch/integrate_from_master | Jie Luo | 2015-05-13 | 255 | -323/+84482 |
| |\ \ | | | | | | | | | Integrate changes from latest master branch into csharp branch. | ||||
| | * | | Regenerate UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 254 | -321/+84480 |
| | |\ \ | |||||
| * | \ \ | Merge pull request #380 from jtattermusch/csharp | Jie Luo | 2015-05-13 | 1 | -8/+28 |
| |\ \ \ \ | | |/ / / | |/| | | | Update README.md for C# | ||||
| | * | | | Update README.md for C# | Jan Tattermusch | 2015-05-13 | 1 | -8/+28 |
| |/ / / | |||||
| * | | | Merge pull request #379 from jskeet/csharp | Jie Luo | 2015-05-13 | 7 | -810/+3781 |
| |\ \ \ | | | | | | | | | | | Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead. | ||||
| | * | | | Update C# code generation script | Jon Skeet | 2015-05-13 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Remove the C#-specific field_presence_test.proto, using ↵ | Jon Skeet | 2015-05-13 | 6 | -807/+3780 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | unittest_no_field_presence.proto instead. This is the start of establishing a C# namespace of "Google.ProtocolBuffers.TestProtos.Proto3" for proto3-syntax protos. We could optionally split the directory structure as well into Proto2 and Proto3 for clarity. | ||||
| * | | | Merge pull request #373 from jtattermusch/csharp_generate_proto | Jon Skeet | 2015-05-13 | 19 | -12118/+147 |
| |\ \ \ | | | | | | | | | | | C# generate_proto.sh and buildall.sh scripts | ||||
| | * | | | regenerated UnittestImportLite.cs | Jan Tattermusch | 2015-05-12 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | regenerated UnittestImportPublicLite | Jan Tattermusch | 2015-05-12 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Regenerated UnittestExtrasLite.cs | Jan Tattermusch | 2015-05-12 | 1 | -51/+48 |
| | | | | | |||||
| | * | | | Regenerated UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-12 | 1 | -77/+18 |
| | | | | | |||||
| | * | | | remove C# files not referenced in any project | Jan Tattermusch | 2015-05-12 | 5 | -11783/+0 |
| | | | | | |||||
| | * | | | Regenerate some proto files after ClsCompliance has been dropped | Jan Tattermusch | 2015-05-12 | 3 | -47/+0 |
| | | | | | |||||
| | * | | | rename FieldPresence to correct name | Jan Tattermusch | 2015-05-12 | 2 | -1/+1 |
| | | | | | |||||
| | * | | | got rid of the outdated mono subdirectory | Jan Tattermusch | 2015-05-12 | 3 | -157/+0 |
| | | | | | |||||
| | * | | | draft of generate_protos.sh | Jan Tattermusch | 2015-05-12 | 1 | -0/+52 |
| | | | | | |||||
| | * | | | add buildall script for mono | Jan Tattermusch | 2015-05-12 | 1 | -0/+22 |
| |/ / / | |||||
| * | | | Merge pull request #372 from jtattermusch/csharp_cleanup | Jie Luo | 2015-05-12 | 2 | -13/+2 |
| |\ \ \ | | | | | | | | | | | C# cleanup | ||||
| | * | | | adding what was missing in .gitignore | Jan Tattermusch | 2015-05-12 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | lib subdir is not needed anymore | Jan Tattermusch | 2015-05-12 | 1 | -13/+0 |
| |/ / / | |||||
| * | | | Merge pull request #370 from jtattermusch/mono_fixes | Jie Luo | 2015-05-12 | 8 | -15/+2 |
| |\ \ \ | | | | | | | | | | | Fixes for Mono | ||||
| | * | | | Fix newline assertion in TestJsonFormatted on mono | Jan Tattermusch | 2015-05-12 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | remove TreatWarningsAsError setting to allow building in Monodevelop | Jan Tattermusch | 2015-05-12 | 7 | -14/+0 |
| |/ / / | |||||
| * | | | Merge pull request #366 from jskeet/csharp | Jan Tattermusch | 2015-05-12 | 48 | -3039/+3049 |
| |\ \ \ | | | | | | | | | | | Convert back to using NUnit, which is now loaded via NuGet. | ||||
| | * | | | Convert back to using NUnit, which is now loaded via NuGet. | Jon Skeet | 2015-05-12 | 48 | -3039/+3049 |
| |/ / / | | | | | | | | | | | | | | | | | This includes the NUnit test adapter which allows NUnit tests to be run under VS without any extra plugins. Unfortunate the compatibility tests using the abstract test fixture class show up as "external" tests, and aren't well presented - but they do run. | ||||
| * | | | Merge pull request #352 from jtattermusch/csharp_performance_fix | Jon Skeet | 2015-05-09 | 1 | -4/+24 |
| |\ \ \ | | | | | | | | | | | Performance optimization for small messages without unknown fields | ||||
| | * | | | Performance optimization for small messages without unknown fields | Jan Tattermusch | 2015-05-07 | 1 | -4/+24 |
| | | | | | |||||
| * | | | | Merge pull request #348 from jskeet/csharp | Jon Skeet | 2015-05-07 | 30 | -9/+44 |
| |\ \ \ \ | | |/ / / | |/| | | | Add C# namespace to .proto files (e.g. descriptors, unit tests) | ||||
| | * | | | Regenerate descriptor.pb.cc after csharp_namespace change | Jon Skeet | 2015-05-07 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Add C# namespace to .proto files (e.g. descriptors, unit tests) | Jon Skeet | 2015-05-06 | 29 | -7/+41 |
| |/ / / | |||||
| * | | | Merge pull request #330 from anandolee/csharp | Jie Luo | 2015-05-01 | 7 | -38/+1 |
| |\ \ \ | | | | | | | | | | | Remove ClsCompliant declarations from C# code (fix #318) | ||||
| | * | | | Remove ClsCompliant declarations from C# code | Jie Luo | 2015-05-01 | 7 | -38/+1 |
| | | | | | |||||
| * | | | | Merge pull request #321 from anandolee/csharp | Jie Luo | 2015-05-01 | 13 | -52/+1152 |
| |\| | | | | | | | | | | | | | Field Presence for Protocol Buffer C# Proto3 | ||||
| | * | | | fix comments | Jie Luo | 2015-05-01 | 4 | -6/+5 |
| | | | | | |||||
| | * | | | Change field_presence_test.proto | Jie Luo | 2015-05-01 | 2 | -6/+2 |
| | | | | | |||||
| | * | | | fix comments | Jie Luo | 2015-04-30 | 3 | -34/+5 |
| | | | | | |||||
| | * | | | fix commends from Jon Skeet | Jie Luo | 2015-04-30 | 7 | -48/+62 |
| | | | | | |||||
| | * | | | Merge branch 'csharp' of git://github.com/google/protobuf into google-csharp | Jie Luo | 2015-04-30 | 106 | -41222/+48786 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #324 from jskeet/csharp | Jon Skeet | 2015-04-30 | 55 | -3744/+3278 |
| |\ \ \ \ | | | | | | | | | | | | | Change to using xUnit for all unit tests, and fetch that via NuGet. | ||||
| | * | | | | Change to using xUnit for all unit tests, and fetch that via NuGet. | Jon Skeet | 2015-04-30 | 55 | -3744/+3278 |
| | | | | | | | | | | | | | | | | | | | | | | | | This includes fetching the VS unit test runner package, so that tests can be run from Visual Studio's Test Explorer. | ||||
| * | | | | | Merge pull request #319 from jskeet/csharp_pcl | Jon Skeet | 2015-04-30 | 54 | -37484/+45514 |
| |\| | | | | | | | | | | | | | | | | Convert C# projects to Portable Class Libraries | ||||
| | * | | | | Convert both the full and lite runtimes (and json/xml serialization ↵ | Jon Skeet | 2015-04-29 | 54 | -37484/+45514 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assemblies) to be Portable Class Libraries. All referring projects are now .NET 4 client rather than .NET 3.5. This commit also fixes up the ProtoBench app, which I'd neglected in previous commits. (Disentangling the two sets of changes would be time-consuming.) | ||||
| | * | | | Merge branch 'csharp' of git://github.com/google/protobuf into google-csharp | Jie Luo | 2015-04-29 | 163 | -20387/+1194 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #317 from jskeet/csharp | Jon Skeet | 2015-04-29 | 163 | -20386/+1193 |
| |\ \ \ \ | | | | | | | | | | | | | Tidying up the C# runtime project | ||||
| | * | | | | Removing more C# project files. | Jon Skeet | 2015-04-29 | 18 | -1802/+0 |
| | | | | | |