AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #1085 from jskeet/fix-generation

Browse Source 
Fix C# source generation shell script and remove out of date notes
This commit is contained in:
Jon Skeet 2016-01-05 07:04:18 +00:00
commit 2f15b8f50c
2 changed files with 1301 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
csharp/generate_protos.sh
View File

@ -3,16 +3,6 @@
# You first need to make sure protoc has been built (see instructions on
# building protoc in root of this repository)
# This script performs a few fix-ups as part of generation. These are:
# - descriptor.proto is renamed to descriptor_proto_file.proto before
# generation, to avoid the naming collision between the class for the file
# descriptor and its Descriptor property
# - This change also impacts UnittestCustomOptions, which expects to
# use a class of Descriptor when it's actually been renamed to
# DescriptorProtoFile.
# - Issue 307 (codegen for double-nested types) breaks Unittest.proto and
# its lite equivalents.
set -ex
# cd to repository root
@ -68,5 +58,5 @@ $PROTOC -Icsharp/protos --csharp_out=csharp/src/Google.Protobuf.Test \
$PROTOC -Iexamples --csharp_out=csharp/src/AddressBook \
examples/addressbook.proto
$PROTOC -Iconformance --csharp_out=csharp/src/Google.Protobuf.Conformance \
$PROTOC -Iconformance -Isrc --csharp_out=csharp/src/Google.Protobuf.Conformance \
conformance/conformance.proto

1414
csharp/src/Google.Protobuf.Conformance/Conformance.cs
View File

File diff suppressed because it is too large Load Diff