Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
9a4692d8
Commit
9a4692d8
authored
Jul 26, 2017
by
Thomas Van Lenten
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the comment on the message_type to cover what it should be.
parent
5eb95efa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
conformance.proto
conformance/conformance.proto
+3
-1
Conformance.cs
csharp/src/Google.Protobuf.Conformance/Conformance.cs
+3
-1
TestMessagesProto3.cs
...src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs
+3
-3
No files found.
conformance/conformance.proto
View file @
9a4692d8
...
...
@@ -78,7 +78,9 @@ message ConformanceRequest {
// Which format should the testee serialize its message to?
WireFormat
requested_output_format
=
3
;
// should be set to either "proto2" or "proto3"
// The full name for the test message to use; for the moment, either:
// protobuf_test_messages.proto3.TestAllTypesProto3 or
// protobuf_test_messages.proto2.TestAllTypesProto2.
string
message_type
=
4
;
}
...
...
csharp/src/Google.Protobuf.Conformance/Conformance.cs
View file @
9a4692d8
...
...
@@ -142,7 +142,9 @@ namespace Conformance {
public
const
int
MessageTypeFieldNumber
=
4
;
private
string
messageType_
=
""
;
/// <summary>
/// should be set to either "proto2" or "proto3"
/// The full name for the test message to use; for the moment, either:
/// protobuf_test_messages.proto3.TestAllTypesProto3 or
/// protobuf_test_messages.proto2.TestAllTypesProto2.
/// </summary>
[
global
::
System
.
Diagnostics
.
DebuggerNonUserCodeAttribute
]
public
string
MessageType
{
...
...
csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs
View file @
9a4692d8
...
...
@@ -198,9 +198,9 @@ namespace ProtobufTestMessages.Proto3 {
"AjgBIjkKCk5lc3RlZEVudW0SBwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAIS"
,
"EAoDTkVHEP///////////wFCDQoLb25lb2ZfZmllbGQiGwoORm9yZWlnbk1l"
,
"c3NhZ2USCQoBYxgBIAEoBSpACgtGb3JlaWduRW51bRIPCgtGT1JFSUdOX0ZP"
,
"TxAAEg8KC0ZPUkVJR05fQkFSEAESDwoLRk9SRUlHTl9CQVoQAkI
v
Cihjb20u"
,
"Z29vZ2xlLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zSAH4AQ
FiBnBy
"
,
"b3RvMw=="
));
"TxAAEg8KC0ZPUkVJR05fQkFSEAESDwoLRk9SRUlHTl9CQVoQAkI
4
Cihjb20u"
,
"Z29vZ2xlLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zSAH4AQ
GiAgZQ
"
,
"
cm90bzNiBnBy
b3RvMw=="
));
descriptor
=
pbr
::
FileDescriptor
.
FromGeneratedCode
(
descriptorData
,
new
pbr
::
FileDescriptor
[]
{
global
::
Google
.
Protobuf
.
WellKnownTypes
.
AnyReflection
.
Descriptor
,
global
::
Google
.
Protobuf
.
WellKnownTypes
.
DurationReflection
.
Descriptor
,
global
::
Google
.
Protobuf
.
WellKnownTypes
.
FieldMaskReflection
.
Descriptor
,
global
::
Google
.
Protobuf
.
WellKnownTypes
.
StructReflection
.
Descriptor
,
global
::
Google
.
Protobuf
.
WellKnownTypes
.
TimestampReflection
.
Descriptor
,
global
::
Google
.
Protobuf
.
WellKnownTypes
.
WrappersReflection
.
Descriptor
,
},
new
pbr
::
GeneratedClrTypeInfo
(
new
[]
{
typeof
(
global
::
ProtobufTestMessages
.
Proto3
.
ForeignEnum
),
},
new
pbr
::
GeneratedClrTypeInfo
[]
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment