aboutsummaryrefslogtreecommitdiff
path: root/csharp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #394 from ironhidegames/csharp-aot-iosJan Tattermusch2015-05-211-3/+15
|\ | | | | Solves AOT compilation issue for Unity - iOS
| * added concrete IEqualityComparer<ExtensionIntPair> implementation in ↵Ruben Garat2015-05-201-3/+15
| | | | | | | | ExtensionRegistryLite.cs to prevent AOT compilation issue with unity in iOS
* | Generate *all* protos in the script, applying fixups.Jon Skeet2015-05-165-39464/+31319
|/ | | | | | | | | | | | | | We still have some protos which aren't generated how we want them to be: - Until we have an option to specify the "umbrella" class, DescriptorProtoFile will be broken. (The change of name here affects the reflection descriptor, which accounts for most of the change. That's easier than trying to work out exactly which occurrences of Descriptor need changing though.) - That change affects UnittestCustomOptions - Issue #307 breaks Unittest.cs After this commit, we don't have the record of the fixups in the files themselves any more, but one centralized record in the shell script.
* Make generate_protos.sh Windows-friendly.Jon Skeet2015-05-142-8/+20
| | | | | | | | | | To my surprise, executing generate_protos.sh used the version of Bash installed with Git for Windows by default. After a few modifications to detect the most appropriate protoc to use, this worked pretty simply. This change also: - adds generation of the address book tutorial proto, - fixes the addressbook.proto to specify proto2 explicitly (to avoid a warning from protoc; I don't think we want warnings...) - fixes the addressbook.proto C# namespace (which I thought I'd done before, but apparently hadn't) - includes the regenerated UnittestCustomOptions.cs apart from the DescriptorProtoFIle => Descriptor change
* Merge pull request #382 from jtattermusch/integrate_from_masterJie Luo2015-05-131-2/+2
|\ | | | | Integrate changes from latest master branch into csharp branch.
| * Regenerate UnittestDropUnknownFields.csJan Tattermusch2015-05-131-2/+2
| |
* | Update README.md for C#Jan Tattermusch2015-05-131-8/+28
|/
* Update C# code generation scriptJon Skeet2015-05-131-3/+1
|
* Remove the C#-specific field_presence_test.proto, using ↵Jon Skeet2015-05-135-806/+3779
| | | | | | | 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.
* regenerated UnittestImportLite.csJan Tattermusch2015-05-121-1/+3
|
* regenerated UnittestImportPublicLiteJan Tattermusch2015-05-121-1/+3
|
* Regenerated UnittestExtrasLite.csJan Tattermusch2015-05-121-51/+48
|
* Regenerated UnittestDropUnknownFields.csJan Tattermusch2015-05-121-77/+18
|
* remove C# files not referenced in any projectJan Tattermusch2015-05-125-11783/+0
|
* Regenerate some proto files after ClsCompliance has been droppedJan Tattermusch2015-05-123-47/+0
|
* rename FieldPresence to correct nameJan Tattermusch2015-05-122-1/+1
|
* got rid of the outdated mono subdirectoryJan Tattermusch2015-05-123-157/+0
|
* draft of generate_protos.shJan Tattermusch2015-05-121-0/+52
|
* add buildall script for monoJan Tattermusch2015-05-121-0/+22
|
* adding what was missing in .gitignoreJan Tattermusch2015-05-121-0/+2
|
* lib subdir is not needed anymoreJan Tattermusch2015-05-121-13/+0
|
* Fix newline assertion in TestJsonFormatted on monoJan Tattermusch2015-05-121-1/+2
|
* remove TreatWarningsAsError setting to allow building in MonodevelopJan Tattermusch2015-05-127-14/+0
|
* Convert back to using NUnit, which is now loaded via NuGet.Jon Skeet2015-05-1248-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.
* Performance optimization for small messages without unknown fieldsJan Tattermusch2015-05-071-4/+24
|
* fix commentsJie Luo2015-05-014-6/+5
|
* Change field_presence_test.protoJie Luo2015-05-012-6/+2
|
* fix commentsJie Luo2015-04-303-34/+5
|
* fix commends from Jon SkeetJie Luo2015-04-307-48/+62
|
* Merge branch 'csharp' of git://github.com/google/protobuf into google-csharpJie Luo2015-04-30105-41222/+48783
|\
| * Change to using xUnit for all unit tests, and fetch that via NuGet.Jon Skeet2015-04-3054-3744/+3275
| | | | | | | | This includes fetching the VS unit test runner package, so that tests can be run from Visual Studio's Test Explorer.
| * Convert both the full and lite runtimes (and json/xml serialization ↵Jon Skeet2015-04-2954-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-csharpJie Luo2015-04-29163-20387/+1194
|\|
| * Removing more C# project files.Jon Skeet2015-04-2918-1802/+0
| |
| * Remove CLS compliance from runtime code.Jon Skeet2015-04-2924-151/+1
| | | | | | | | We need to remove it from the generator too; I'll raise a github issue for that.
| * Update C# solution and AddressBook project.Jon Skeet2015-04-294-1389/+1192
| | | | | | | | | | | | | | | | Move to a single solution file containing all of the C# projects, but no other solution folders - it's easier to edit those files outside VS than keep adding and removing them from the project. The AddressBook protos have been regenerated (with a change to the example proto which I haven't included in this change - I'll wait for us to decide exactly what we're doing with namespaces before changing protos outside the csharp directory. Note that now we've got Addressbook.cs which contains AddressBook and Addressbook classes. It's bad enough that we've got a class called AddressBook within a namespace of AddressBook (hard to get away from) but having things vary just by case is nasty. This is more evidence that an option for renaming the file and descriptor class would be welcome. (A single option can probably handle both.)
| * Remove support for Serializable.Jon Skeet2015-04-299-465/+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-2911-594/+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-2999-15985/+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
* | rename FieldPResenceTest.cs fileJie Luo2015-04-291-28/+28
| |
* | Change the package for field_presence_test.protoJie Luo2015-04-293-990/+808
| |
* | field presence Reflection and testsJie Luo2015-04-299-10/+1225
|/
* Update DescriptorProtoFile.cs and UnitTest.cs to indicate manual changes.Jon Skeet2015-04-283-31312/+39144
| | | | (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.)
* Updated set of unit tests and unit test protos.Jon Skeet2015-04-2867-93042/+164903
| | | | | | | | | | This commit includes changes to the C#-specific protos, and rebuilt versions of the "stock" protos. The stock protos have been locally updated to have a specific C# namespace, but this is expected to change soon, so hasn't been committed. Four areas are currently not tested: 1) Serialization - we may restore this at some point, possibly optionally. 2) Services - currently nothing is generated for this; will need to see how it interacts with GRPC 3) Fields beginning with _{digit} - see https://github.com/google/protobuf/issues/308 4) Fields with names which conflict with the declaring type in nasty ways - see https://github.com/google/protobuf/issues/309
* First part of making the C# runtime work with the new codegen.Jon Skeet2015-04-2811-11390/+10632
| | | | | | | | 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...
* removed .hgignore fileJan Tattermusch2015-04-161-23/+0
|
* Added instructions to manually download the dependenciesJan Tattermusch2015-04-162-0/+16
|
* cleanup of csharp/lib/ directoryJan Tattermusch2015-04-1688-36442/+0
|
* Updated readme.md and changes.txt, removed old license.txtJan Tattermusch2015-04-163-48/+26
|
* Imported protobuf-csharp-port into csharp/ treeJan Tattermusch2015-04-16501-0/+239600
|