aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/ProtocolBuffers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'csharp' of git://github.com/google/protobuf into google-csharpJie Luo2015-04-2942-3221/+1
|\
| * Remove CLS compliance from runtime code.Jon Skeet2015-04-2916-130/+1
| | | | | | | | We need to remove it from the generator too; I'll raise a github issue for that.
| * Remove support for Serializable.Jon Skeet2015-04-293-203/+0
| | | | | | | | | | This could potentially be added back in later, but its use is limited and it's a pain in terms of support in PCL environments. One use that has been highlighted is passing objects between AppDomains; we'd recommend passing a byte array explicitly and reparsing on the other side.
| * Remove RPC support.Jon Skeet2015-04-297-453/+0
| | | | | | | | It is expected that third parties will generate service/RPC code themselves - see gRPC as an example.
| * Remove a bunch of files which are no longer relevant:Jon Skeet2015-04-2918-2435/+0
| | | | | | | | | | | | 1) Project files for different configurations - we're going to look at all this again, ideally to just have a single PCL-compatible build 2) ProtoGen - the C++ generator is now the only one we care about 3) Proto files - these are mostly duplicates (or older versions) of the ones in the common directories
* | field presence Reflection and testsJie Luo2015-04-295-10/+47
|/
* Update DescriptorProtoFile.cs and UnitTest.cs to indicate manual changes.Jon Skeet2015-04-281-105/+110
| | | | (Having regenerated descriptor.proto relative to src, the earlier commented-out code checking that dependencies match may now be okay to uncomment again. Will experiment in later CLs.)
* First part of making the C# runtime work with the new codegen.Jon Skeet2015-04-287-11188/+10631
| | | | | | | | 1) Remove CSharpOptions 2) A new version of DescriptorProtoFile (with manual changes from codegen - it would otherwise be Descriptor.cs) 3) Turn off CLS compliance (which we'll remove from the codebase entirely; I don't think it's actually relevant these days) 4) Add "public imports" to FileDescriptor, with code broadly copied from the Java codebase. Lots more changes to commit before it will build and tests run, but one step at a time...
* Imported protobuf-csharp-port into csharp/ treeJan Tattermusch2015-04-16112-0/+34791