diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-04-28 16:26:19 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-04-28 16:26:19 -0700 |
| commit | 8bae6c09bc8c8be808f0acc9b2ad4c9811493060 (patch) | |
| tree | 9819ef25dbe807e4e7f0d6c7dbff7f553b1a8723 /csharp/protos/extest/unittest_extras_lite.proto | |
| parent | 8a3ec53e862cffd310caf434c2c0898782c952f7 (diff) | |
| parent | 32ead755d1f97e414f4a50edb7d9f1ebd9cab562 (diff) | |
| download | protobuf-8bae6c09bc8c8be808f0acc9b2ad4c9811493060.tar.gz protobuf-8bae6c09bc8c8be808f0acc9b2ad4c9811493060.tar.bz2 protobuf-8bae6c09bc8c8be808f0acc9b2ad4c9811493060.zip | |
Merge pull request #1 from google/csharp
Csharp update
Diffstat (limited to 'csharp/protos/extest/unittest_extras_lite.proto')
| -rw-r--r-- | csharp/protos/extest/unittest_extras_lite.proto | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/csharp/protos/extest/unittest_extras_lite.proto b/csharp/protos/extest/unittest_extras_lite.proto index ea1bcd25..0c242d2f 100644 --- a/csharp/protos/extest/unittest_extras_lite.proto +++ b/csharp/protos/extest/unittest_extras_lite.proto @@ -1,14 +1,9 @@ -// Additional options required for C# generation. File from copyright
-// line onwards is as per original distribution.
-import "google/protobuf/csharp_options.proto";
-option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";
-option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestExtrasLiteProtoFile";
-option (google.protobuf.csharp_file_options).add_serializable = true;
+syntax = "proto2";
package protobuf_unittest_extra;
+option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
option optimize_for = LITE_RUNTIME;
-
option java_package = "com.google.protobuf";
message TestRequiredLite {
@@ -58,7 +53,10 @@ message TestInteropEmployeeIdLite { }
extend TestInteropPersonLite {
- required TestInteropEmployeeIdLite employee_id_lite = 126;
+ // Note: changed from required to optional, as required fields are not
+ // permitted in extensions. (The fact that this was allowed in protogen
+ // before was almost certainly a bug.)
+ optional TestInteropEmployeeIdLite employee_id_lite = 126;
}
/* Removed from unittest_lite.proto and added back here */
|