Commit Graph

2548 Commits

Author SHA1 Message Date
Jisi Liu
12f6e3dd0e update header list.
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
2015-07-17 11:36:51 -07:00
Jisi Liu
4dde2a87a9 Merge branch 'master' of github.com:google/protobuf into splitheader
Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
2015-07-17 11:36:29 -07:00
Jisi Liu
7b216119ee Update make file for extra headers.
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
2015-07-17 11:34:33 -07:00
Jan Tattermusch
4e354c7028 Merge pull request #616 from jskeet/rename
First pass at the big rename from ProtocolBuffers to Google.Protobuf.
2015-07-17 10:37:45 -07:00
Jon Skeet
86cf61d448 Updated csharp_EXTRA_DIST for Travis 2015-07-17 10:14:29 +01:00
Jon Skeet
59eeebee87 First pass at the big rename from ProtocolBuffers to Google.Protobuf.
We'll see what I've missed when CI fails...
2015-07-17 08:26:04 +01:00
Jon Skeet
0f442a7533 Merge pull request #611 from jskeet/csharp-wrappers
C# wrapper types
2015-07-17 07:29:50 +01:00
Jon Skeet
34878cb14e Fixes from PR review. 2015-07-17 06:41:46 +01:00
Jan Tattermusch
fa544f4835 Merge pull request #586 from jtattermusch/csharp_names_export
Export c# naming routines publicly
2015-07-16 17:33:56 -07:00
Jisi Liu
4e694f7b23 Split up common.h headers
Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
2015-07-16 16:49:38 -07:00
Jie Luo
ea7de1dadb Merge pull request #612 from jtattermusch/csharp_distcheck_fix
Fix make distcheck
2015-07-16 13:43:02 -07:00
Jon Skeet
3da90e9f54 Make the map test actually test the code... 2015-07-16 21:34:10 +01:00
Jan Tattermusch
a5cbf7061d Merge pull request #607 from jtattermusch/csharp_appveyor
Run C# tests on Appveyor
2015-07-16 12:27:29 -07:00
Josh Haberman
181c7f2636 Added Ruby to conformance tests.
This involved fixing a few important bugs in the
Ruby implementation -- mostly cases of mixing
upb field types and descriptor types (upb field
types do not distinguish between int/sint/fixed/sfixed
like descriptor types do).

Also added protobuf-specific exceptions so parse
errors can be caught specifically.

Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
2015-07-16 12:25:55 -07:00
Jie Luo
b2d2cf8b48 ignore UTF-8 BOM if it is in the begining of a proto file 2015-07-16 11:59:21 -07:00
Jan Tattermusch
271cba2871 updated csharp_EXTRA_DIST 2015-07-16 11:25:16 -07:00
Jon Skeet
8a0312b201 First pass at wrapper types.
- We do still generate the message types, as otherwise reflection breaks, even though it doesn't actually use those types.
- JSON handling hasn't been implemented yet
2015-07-16 17:03:06 +01:00
Jon Skeet
8d47ec4f3e Fixes to ByteString's equality handling. 2015-07-16 09:36:31 +01:00
Jon Skeet
b2ac868493 First part of implementing wrapper types. Not ready yet! 2015-07-16 09:36:30 +01:00
Jon Skeet
7ea5239792 Merge pull request #610 from jskeet/fix-enumerator
Remove the struct-based iterator for RepeatedField.
2015-07-16 09:34:04 +01:00
Jon Skeet
78b452b7ac Remove the struct-based iterator for RepeatedField.
We don't use it in the runtime or generated code anywhere now, so the extra small performance boost isn't as critical, and it has some undesirable consequences.

The tests have needed to change as iterator block enumerators don't throw when we might expect them to.
2015-07-16 09:26:10 +01:00
Jon Skeet
3bf74a91bb Merge pull request #605 from jtattermusch/csharp_cleanup
Assorted nits from C# code.
2015-07-16 08:08:45 +01:00
Jan Tattermusch
d4794c56b5 add C# build and tests to appveyor 2015-07-15 23:34:19 -07:00
Jan Tattermusch
b4a24aa5fa added comment for ByteString.CopyFrom 2015-07-15 23:29:45 -07:00
Jan Tattermusch
ab5fffcc9e C# cleanup - assorted nits 2015-07-15 23:29:45 -07:00
Jon Skeet
19cf9d1e00 Merge pull request #606 from jtattermusch/csharp-experimental-merged
Update csharp-experimental with changes from upstream/master
2015-07-16 07:11:40 +01:00
Jan Tattermusch
11002e70c6 Merge remote-tracking branch 'upstream/master' into csharp-experimental 2015-07-15 20:33:59 -07:00
Jon Skeet
385baaa87c Merge pull request #599 from jskeet/no-map-entries
Don't generate types for map entry messages
2015-07-15 22:05:17 +01:00
Jon Skeet
db52c9dd58 Address requested change from code review. 2015-07-15 22:04:45 +01:00
Jon Skeet
541b442b99 Don't create nested types (or field accessors) for map types.
I'm sure I've implemented this before, but somehow it's been lost in a maze of twisty little branches, all alike.
2015-07-15 22:04:45 +01:00
Jan Tattermusch
f828160454 Merge pull request #594 from jskeet/csharp-wellknowntypes
Introduce C# well-known types
2015-07-15 13:55:00 -07:00
Rob Earhart
2f4fb642a3 Install missing headers
Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h.

Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
2015-07-14 17:17:52 -07:00
Jon Skeet
62a4aa56d4 Generated code for well-known types 2015-07-14 14:26:49 +01:00
Jon Skeet
739d13d5d1 Generate the well-known types in C#
This involves:
- Specifying a namespace in each proto (including ones we'd previously missed)
- Updating the generation script
- Changing codegen to implement IReflectedMessage.Fields explicitly (a good thing anyway)
- Changing reflection tests to take account of the explicit interface implementation

Non-generated code in this commit; generated code to follow
2015-07-14 14:26:31 +01:00
Jon Skeet
f30c3d35c6 Merge pull request #593 from jskeet/reflection-namespace
Change the reflection namespace in C#
2015-07-14 13:22:05 +01:00
Jon Skeet
1660c5631e Changing reflection namespace (part 4)
Update code already within Google.Protobuf.Reflection which was importing Google.Protobuf.DescriptorProtos
2015-07-14 11:38:06 +01:00
Jon Skeet
9c888fa3a2 Changing reflection namespace (part 3)
Change the C# namespace in descriptor.proto to Google.Protobuf.Reflection.
This then means changing where the generated code lives, which means updating the project file...

It also involves regenerating the C++ - which has updated the well-known types as well,
for no terribly obvious reason...
2015-07-14 11:13:52 +01:00
Jon Skeet
76940942cf Changing reflection namespace (part 2)
Generated code changes from previous commit
2015-07-14 10:25:40 +01:00
Jon Skeet
9f37de960f Changing reflection namespace (part 1)
- Move types into Google.Protobuf.Reflection
- Change codegen to reflect that in generated types

Generated code changes coming in part 2
2015-07-14 10:24:52 +01:00
Jon Skeet
24f8626cc9 Merge pull request #583 from jskeet/issue312
Pascal-case namespace automatically in C# codegen
2015-07-14 09:53:35 +01:00
Jon Skeet
8482b6c462 Convert package name to PascalCase for C# namespace
Fixes issue 312.
2015-07-14 09:52:35 +01:00
Jon Skeet
9440a2abe3 Merge pull request #582 from jskeet/csharp-json
JSON formatting in C#
2015-07-14 09:50:57 +01:00
Jon Skeet
0f34daad07 Changes suggested during review.
- Remove the indexers in FieldAccessorTable
- Add a TODO for field ordering in oneof
2015-07-14 09:41:28 +01:00
Jisi Liu
fde6e89f99 Merge pull request #591 from pherl/fixbuild
remove pbconfig from extract script
2015-07-13 11:28:25 -07:00
Jisi Liu
bd4bc9e72c remove pbconfig from extract script
Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
2015-07-13 10:41:18 -07:00
Joshua Haberman
a3ca1fa4bf Merge pull request #588 from haberman/conformance-json
Added support for JSON and valid input to conformance tests.
2015-07-13 09:50:01 -07:00
Jon Skeet
b918dc1b17 Merge pull request #587 from jtattermusch/nuget_pkg
enable building nuget package
2015-07-12 20:53:14 +01:00
Jan Tattermusch
6c8c5b402b Update Google.Protobuf.nuspec 2015-07-12 11:51:08 -07:00
Josh Haberman
b0500b37b2 Added support for Json and valid input to conformance tests.
This was enabled by the recent open-sourcing of JSON
support and MessageDifferencer.

MessageDifferencer allows the conformance suite to expand
because it allows us to write tests for payloads that parse
successfully.  To verify the testee's output payload, we
need to parse it back into a message and compare the message
instances.  Comparing output bytes vs. a golden message is
*not* valid, because protobufs do not have a canonical
encoding (especially in the presence of maps, which have
no prescribed serialization order).

We only add one small JSON test for now, but with the
framework in place we now have the foundation to dramatically
expand the coverage of the conformance test suite.

Also added the ability for the testee to skip tests that
exercise features that are unimplemented.  This allows
Java (which currently has no JSON support) to skip tests
involving JSON.

Change-Id: I697b4363da432b61ae3b638b4287c4cda1af4deb
2015-07-10 16:36:59 -07:00
Jan Tattermusch
46feed023d enable building nuget package 2015-07-10 15:23:28 -07:00