aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Merge branch 'csharp-remove-extensions' into csharp-fixupJon Skeet2015-07-092-47/+1
| | |\ \ \
| | | * | | Remove unused code in C# codegenJon Skeet2015-06-302-47/+1
| | | | | |
| | * | | | Minor fix-ups as suggested in PR #560.Jon Skeet2015-07-096-58/+103
| |/ / / / | | | | | | | | | | | | | | | | | | | | - Added new line at the end of SampleEnum - Moved GeneratedMessageTest.GetSampleMessage to a new class, SampleMessages, and renamed it to CreateFullTestAllTypes.
| * | | | Merge pull request #561 from jskeet/csharp-copyrightJon Skeet2015-07-0957-215/+508
| |\| | | | | | | | | | | | | Fix C# copyright statements
| | * | | Fix copyright lines for all C# code.Jon Skeet2015-06-3057-215/+508
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything should now be consistent - the only difference between files is the year (aside from generated files). Fixes issue #531.
| * | | | Merge pull request #560 from jskeet/csharp-repeatedJon Skeet2015-07-0925-2353/+1561
| |\| | | | | | | | | | | | | Large changes to repeated field handling
| | * | | Tidying up and extra tests.Jon Skeet2015-06-3017-457/+871
| | | | | | | | | | | | | | | | | | | | This is mostly just making things internal instead of public, removing and reordering a bunch of code in CodedInputStream/CodedOutputStream, and generally tidying up.
| | * | | Tests changed enough to buildJon Skeet2015-06-303-15/+36
| | | | |
| | * | | First pass (not yet compiling) at removing all the array handling code from ↵Jon Skeet2015-06-3012-1920/+693
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Coded*Stream. Prod code works, but some tests are broken. Obviously those need fixing, then more tests, and review benchmarks.
| * | | Merge pull request #550 from jskeet/issue307Jon Skeet2015-06-293-22/+314
| |\ \ \ | | | | | | | | | | Fix for doubly-nested types - issue #307.
| | * | | Fix for doubly-nested types - issue #307.Jon Skeet2015-06-293-22/+314
| |/ / / | | | | | | | | | | | | No specific test case - if the generated code compiles, the issue is fixed :)
| * | | Merge pull request #544 from jskeet/csharp-cleanupJon Skeet2015-06-2897-49470/+121
| |\ \ \ | | | | | | | | | | Clean up C# code
| | * | | More cleanup, based around searches for "Google.ProtocolBuffers"Jon Skeet2015-06-2657-1808/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove some old proto2-based C#-only messages - Remove the "build" directory which only contained out-of-date files - Remove the csharp_namespace option from proto2 messages - Change "Google.ProtocolBuffers" to "Google.Protobuf" in other messages
| | * | | Remove a lot of code which wasn't needed any more.Jon Skeet2015-06-2622-1154/+59
| | | | |
| | * | | Fix or delete old projects.Jon Skeet2015-06-2619-46509/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProtoDump isn't currently useful, but will be when ToString emits JSON: fixed. ProtoBench: deleted; we should reinstate when there's a common proto3 benchmark. ProtoMunge: delete; not useful enough to merit fixing up. Removed the [TestFixture] from ByteStringTest as Travis uses a recent enough version of NUnit.
| * | | | Merge pull request #543 from jskeet/proto3-mapJon Skeet2015-06-2635-102/+8878
| |\| | | | | | | | | | | | | Proto3 map support for C#
| | * | | Tests for FieldCodec, along with a fix.Jon Skeet2015-06-263-1/+151
| | | | |
| | * | | Generated code changes for previous commit.Jon Skeet2015-06-267-661/+7091
| | | | |
| | * | | Tweaks and more tests for mapsJon Skeet2015-06-269-32/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change the default message hash code to 1 to be consistent with other code - Change the empty list/map hash code to 0 as "empty map" is equivalent to "no map" - Removed map fields from unittest_proto3.proto - Created map_unittest_proto3.proto which is like map_unittest.proto but proto3-only - Fixed factory methods in FieldCodec highlighted by using all field types :) - Added tests for map serialization: - Extra fields within entries - Entries with value then key - Non-contiguous entries for the same map - Multiple entries for the same key Changes to generated code coming in next commit
| | * | | Make map test keys even more different to avoid odd hash collisionsJon Skeet2015-06-251-8/+8
| | | | |
| | * | | Generated code changes due to map changes.Jon Skeet2015-06-256-69/+138
| | | | | | | | | | | | | | | | | | | | (Primarily this is starting the hash code of messages at a non-zero value...)
| | * | | More map tests, and various production code improvements.Jon Skeet2015-06-258-40/+492
| | | | | | | | | | | | | | | | | | | | Generated code in next commit.
| | * | | Generated map code.Jon Skeet2015-06-251-87/+592
| | | | |
| | * | | First pass at map support.Jon Skeet2015-06-2520-10/+913
| | | | | | | | | | | | | | | | | | | | More tests required. Generated code in next commit.
| * | | | Merge pull request #534 from jskeet/proto3-freezeJon Skeet2015-06-2532-312/+1695
| |\| | | | | | | | | | | | | Implement Freeze in C# protos
| | * | | Get the Mono build script working again.Jon Skeet2015-06-253-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The solution as a whole doesn't build yet - we probably want to remove ProtoDump and ProtoMunge entirely, and ProtoBench should use Jan's new benchmarks for parity with Java. The version of NUnit on my machine, packaged with Mono 3.12.1, is only NUnit 2.4.2, which is extremely old - it still requires an explicit [TestFixture] attribute on test fixtures. I've added one just for ByteStringTest for the moment so that we can see some tests passing in Travis, but as part of a separate PR we should work on making sure we're using a recent NUnit version. (It may already be doing so, but we can check that once it's working and merged.)
| | * | | Regenerated descriptor C++ codeJon Skeet2015-06-251-3/+2
| | | | |
| | * | | Revert the change to wire_format.h.Jon Skeet2015-06-245-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | It seems too much code relies on the broken behaviour. See issue #493. Instead, we reimplement MakeTag just for C#, temporarily.
| | * | | Implement freezing for messages and repeated fields.Jon Skeet2015-06-2425-292/+1668
| |/ / / | | | | | | | | | | | | Fixes issue #523.
| * | | Merge pull request #536 from jtattermusch/fix_appveyorJon Skeet2015-06-2433-295/+422
| |\ \ \ | | | | | | | | | | Integrate changes from upstream/master
| | * | | Merge remote-tracking branch 'upstream/master' into fix_appveyorJan Tattermusch2015-06-2433-295/+422
| |/| | |
| * | | | Merge pull request #532 from jskeet/proto3-cloneJan Tattermusch2015-06-2323-151/+991
| |\ \ \ \ | | | | | | | | | | | | Implement Clone.
| | * | | | Generated code changes from previous commit.Jon Skeet2015-06-236-66/+66
| | | | | |
| | * | | | Implement requested changes for IMessage<T>Jon Skeet2015-06-232-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) New line at end of file 2) Make IMessage<T> itself extend IEquatable<T> and IDeepCloneable<T>
| | * | | | Implement Clone.Jon Skeet2015-06-2323-149/+988
| |/ / / / | | | | | | | | | | | | | | | Fixes issue #527.
| * | | | Merge pull request #515 from jskeet/proto3-onlyJan Tattermusch2015-06-19237-199324/+12288
| |\ \ \ \ | | | | | | | | | | | | Proto3 experimental C# fork
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-19107-330/+28853
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update the readme to give more context of what's going on.Jon Skeet2015-06-191-14/+15
| | | | | |
| | * | | | Minor cleanup.Jon Skeet2015-06-1918-254/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make some members internal - Remove a lot of FrameworkPortability that isn't required - Start adding documentation comments - Remove some more group-based members - Not passing in "the last tag read" into Read*Array, g
| | * | | | Use an empty array instead of a null reference for an empty repeated field.Jon Skeet2015-06-191-22/+10
| | | | | |
| | * | | | Use our "local" copy of Encoding.UTF8 in CodedInputStream too.Jon Skeet2015-06-173-7/+8
| | | | | |
| | * | | | Delete "lite" project and serialization project+codeJon Skeet2015-06-1746-61270/+0
| | | | | | | | | | | | | | | | | | | | | | | | We'll probably want a lot of the code from the serialization project when we do JSON, but enough of it will change that it's not worth keeping in a broken state for now.
| | * | | | Regenerated files.Jon Skeet2015-06-171-3/+3
| | | | | |
| | * | | | Updates to handle use of cmake for Windows builds.Jon Skeet2015-06-173-8/+5
| | | | | |
| | * | | | Merged masterJon Skeet2015-06-17159-16792/+13554
| | |\ \ \ \
| | * | | | | Remove a lot of projects which are effectively dead from the solution - ↵Jon Skeet2015-06-171-25/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | files to be killed later.
| | * | | | | Use the fact that we know the tag size and bytes at codegen time to optimize.Jon Skeet2015-06-1719-1188/+970
| | | | | | |
| | * | | | | Regenerate proto filesJon Skeet2015-06-126-671/+838
| | | | | | |
| | * | | | | Fix oneof generator - forgot to provide variables...Jon Skeet2015-06-121-0/+1
| | | | | | |
| | * | | | | Reimplement RepeatedField<T> using an array as the backing store.Jon Skeet2015-06-125-51/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is effectively reimplementing List<T>, but with a few advantages: - We know that an empty repeated field is common, so don't allocate an array until we need to - With direct access to the array, we can easily convert enum values to int without boxing - We can relax the restrictions over what happens if the repeated field is modified while iterating, avoiding so much checking This is somewhat risky, in that reimplementing a building block like this is *always* risky, but hey... (The performance benefits are significant...)