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
91ff83c0
Commit
91ff83c0
authored
7 years ago
by
Jon Skeet
Committed by
Jon Skeet
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove non-C# options from C#-only test protos
parent
d3537c24
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
41 deletions
+13
-41
map_unittest_proto3.proto
csharp/protos/map_unittest_proto3.proto
+0
-1
unittest_import_proto3.proto
csharp/protos/unittest_import_proto3.proto
+0
-12
unittest_import_public_proto3.proto
csharp/protos/unittest_import_public_proto3.proto
+0
-1
unittest_issues.proto
csharp/protos/unittest_issues.proto
+0
-1
unittest_proto3.proto
csharp/protos/unittest_proto3.proto
+4
-16
MapUnittestProto3.cs
.../src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
+1
-1
UnittestImportProto3.cs
...c/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
+2
-3
UnittestImportPublicProto3.cs
...le.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
+2
-2
UnittestIssues.cs
csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
+2
-2
UnittestProto3.cs
csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
+2
-2
No files found.
csharp/protos/map_unittest_proto3.proto
View file @
91ff83c0
...
...
@@ -36,7 +36,6 @@
// required fields in proto3.
syntax
=
"proto3"
;
option
cc_enable_arenas
=
true
;
option
csharp_namespace
=
"Google.Protobuf.TestProtos"
;
import
"unittest_proto3.proto"
;
...
...
This diff is collapsed.
Click to expand it.
csharp/protos/unittest_import_proto3.proto
View file @
91ff83c0
...
...
@@ -36,22 +36,10 @@
syntax
=
"proto3"
;
// We don't put this in a package within proto2 because we need to make sure
// that the generated code doesn't depend on being in the proto2 namespace.
// In test_util.h we do
// "using namespace unittest_import = protobuf_unittest_import".
package
protobuf_unittest_import
;
option
optimize_for
=
SPEED
;
option
cc_enable_arenas
=
true
;
// Exercise the java_package option.
option
java_package
=
"com.google.protobuf.test"
;
option
csharp_namespace
=
"Google.Protobuf.TestProtos"
;
// Do not set a java_outer_classname here to verify that Proto2 works without
// one.
// Test public import
import
public
"unittest_import_public_proto3.proto"
;
...
...
This diff is collapsed.
Click to expand it.
csharp/protos/unittest_import_public_proto3.proto
View file @
91ff83c0
...
...
@@ -34,7 +34,6 @@ syntax = "proto3";
package
protobuf_unittest_import
;
option
java_package
=
"com.google.protobuf.test"
;
option
csharp_namespace
=
"Google.Protobuf.TestProtos"
;
message
PublicImportMessage
{
...
...
This diff is collapsed.
Click to expand it.
csharp/protos/unittest_issues.proto
View file @
91ff83c0
...
...
@@ -7,7 +7,6 @@ syntax = "proto3";
option
csharp_namespace
=
"UnitTest.Issues.TestProtos"
;
package
unittest_issues
;
option
optimize_for
=
SPEED
;
// Issue 307: when generating doubly-nested types, any references
// should be of the form A.Types.B.Types.C.
...
...
This diff is collapsed.
Click to expand it.
csharp/protos/unittest_proto3.proto
View file @
91ff83c0
...
...
@@ -36,28 +36,16 @@
syntax
=
"proto3"
;
// Some generic_services option(s) added automatically.
// See: http://go/proto2-generic-services-default
option
cc_generic_services
=
true
;
// auto-added
option
java_generic_services
=
true
;
// auto-added
option
py_generic_services
=
true
;
// auto-added
option
cc_enable_arenas
=
true
;
option
csharp_namespace
=
"Google.Protobuf.TestProtos"
;
// Only present so we can test that we can read it (as an example
// of a non-C# option)
option
java_outer_classname
=
"UnittestProto"
;
import
"unittest_import_proto3.proto"
;
// We don't put this in a package within proto2 because we need to make sure
// that the generated code doesn't depend on being in the proto2 namespace.
// In test_util.h we do "using namespace unittest = protobuf_unittest".
package
protobuf_unittest3
;
// Protos optimized for SPEED use a strict superset of the generated code
// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
// tests for speed unless explicitly testing code size optimization.
option
optimize_for
=
SPEED
;
option
java_outer_classname
=
"UnittestProto"
;
// This proto includes every type of field in both singular and repeated
// forms.
message
TestAllTypes
{
...
...
This diff is collapsed.
Click to expand it.
csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
View file @
91ff83c0
...
...
@@ -145,7 +145,7 @@ namespace Google.Protobuf.TestProtos {
"bmdNYXBDYWxsZWRFbnRyeS5FbnRyeUVudHJ5GiwKCkVudHJ5RW50cnkSCwoD"
,
"a2V5GAEgASgFEg0KBXZhbHVlGAIgASgFOgI4ASo/CgdNYXBFbnVtEhAKDE1B"
,
"UF9FTlVNX0ZPTxAAEhAKDE1BUF9FTlVNX0JBUhABEhAKDE1BUF9FTlVNX0JB"
,
"WhACQ
iD4AQG
qAhpHb29nbGUuUHJvdG9idWYuVGVzdFByb3Rvc2IGcHJvdG8z"
));
"WhACQ
h2
qAhpHb29nbGUuUHJvdG9idWYuVGVzdFByb3Rvc2IGcHJvdG8z"
));
descriptor
=
pbr
::
FileDescriptor
.
FromGeneratedCode
(
descriptorData
,
new
pbr
::
FileDescriptor
[]
{
global
::
Google
.
Protobuf
.
TestProtos
.
UnittestProto3Reflection
.
Descriptor
,
},
new
pbr
::
GeneratedClrTypeInfo
(
new
[]
{
typeof
(
global
::
Google
.
Protobuf
.
TestProtos
.
MapEnum
),
},
new
pbr
::
GeneratedClrTypeInfo
[]
{
...
...
This diff is collapsed.
Click to expand it.
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
View file @
91ff83c0
...
...
@@ -26,9 +26,8 @@ namespace Google.Protobuf.TestProtos {
"dGVzdF9pbXBvcnQaI3VuaXR0ZXN0X2ltcG9ydF9wdWJsaWNfcHJvdG8zLnBy"
,
"b3RvIhoKDUltcG9ydE1lc3NhZ2USCQoBZBgBIAEoBSpZCgpJbXBvcnRFbnVt"
,
"EhsKF0lNUE9SVF9FTlVNX1VOU1BFQ0lGSUVEEAASDgoKSU1QT1JUX0ZPTxAH"
,
"Eg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFaEAlCPAoYY29tLmdvb2ds"
,
"ZS5wcm90b2J1Zi50ZXN0SAH4AQGqAhpHb29nbGUuUHJvdG9idWYuVGVzdFBy"
,
"b3Rvc1AAYgZwcm90bzM="
));
"Eg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFaEAlCHaoCGkdvb2dsZS5Q"
,
"cm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3RvMw=="
));
descriptor
=
pbr
::
FileDescriptor
.
FromGeneratedCode
(
descriptorData
,
new
pbr
::
FileDescriptor
[]
{
global
::
Google
.
Protobuf
.
TestProtos
.
UnittestImportPublicProto3Reflection
.
Descriptor
,
},
new
pbr
::
GeneratedClrTypeInfo
(
new
[]
{
typeof
(
global
::
Google
.
Protobuf
.
TestProtos
.
ImportEnum
),
},
new
pbr
::
GeneratedClrTypeInfo
[]
{
...
...
This diff is collapsed.
Click to expand it.
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
View file @
91ff83c0
...
...
@@ -24,8 +24,8 @@ namespace Google.Protobuf.TestProtos {
string
.
Concat
(
"CiN1bml0dGVzdF9pbXBvcnRfcHVibGljX3Byb3RvMy5wcm90bxIYcHJvdG9i"
,
"dWZfdW5pdHRlc3RfaW1wb3J0IiAKE1B1YmxpY0ltcG9ydE1lc3NhZ2USCQoB"
,
"ZRgBIAEoBUI
3Chhjb20uZ29vZ2xlLnByb3RvYnVmLnRlc3SqAhpHb29nbGUu
"
,
"
UHJvdG9idWYuVGVzdFByb3Rvc2IGcHJvdG8z
"
));
"ZRgBIAEoBUI
dqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3Rv
"
,
"
Mw==
"
));
descriptor
=
pbr
::
FileDescriptor
.
FromGeneratedCode
(
descriptorData
,
new
pbr
::
FileDescriptor
[]
{
},
new
pbr
::
GeneratedClrTypeInfo
(
null
,
new
pbr
::
GeneratedClrTypeInfo
[]
{
...
...
This diff is collapsed.
Click to expand it.
csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
View file @
91ff83c0
...
...
@@ -48,8 +48,8 @@ namespace UnitTest.Issues.TestProtos {
"GAEgASgFEgkKAXkYAiABKAVCBwoFdmFsdWUqVQoMTmVnYXRpdmVFbnVtEhYK"
,
"Ek5FR0FUSVZFX0VOVU1fWkVSTxAAEhYKCUZpdmVCZWxvdxD7//////////8B"
,
"EhUKCE1pbnVzT25lEP///////////wEqLgoORGVwcmVjYXRlZEVudW0SEwoP"
,
"REVQUkVDQVRFRF9aRVJPEAASBwoDb25lEAFCH
0gBqgIaVW5pdFRlc3QuSXNz
"
,
"
dWVzLlRlc3RQcm90b3NiBnByb3RvMw=
="
));
"REVQUkVDQVRFRF9aRVJPEAASBwoDb25lEAFCH
aoCGlVuaXRUZXN0Lklzc3Vl
"
,
"
cy5UZXN0UHJvdG9zYgZwcm90bzM
="
));
descriptor
=
pbr
::
FileDescriptor
.
FromGeneratedCode
(
descriptorData
,
new
pbr
::
FileDescriptor
[]
{
},
new
pbr
::
GeneratedClrTypeInfo
(
new
[]
{
typeof
(
global
::
UnitTest
.
Issues
.
TestProtos
.
NegativeEnum
),
typeof
(
global
::
UnitTest
.
Issues
.
TestProtos
.
DeprecatedEnum
),
},
new
pbr
::
GeneratedClrTypeInfo
[]
{
...
...
This diff is collapsed.
Click to expand it.
csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
View file @
91ff83c0
...
...
@@ -149,8 +149,8 @@ namespace Google.Protobuf.TestProtos {
"b28SHi5wcm90b2J1Zl91bml0dGVzdDMuRm9vUmVxdWVzdBofLnByb3RvYnVm"
,
"X3VuaXR0ZXN0My5Gb29SZXNwb25zZRJGCgNCYXISHi5wcm90b2J1Zl91bml0"
,
"dGVzdDMuQmFyUmVxdWVzdBofLnByb3RvYnVmX3VuaXR0ZXN0My5CYXJSZXNw"
,
"b25zZUI
6Qg1Vbml0dGVzdFByb3RvSAGAAQGIAQGQAQH4AQGqAhpHb29nbGUu
"
,
"
UHJvdG9idWYuVGVzdFByb3Rvc2IGcHJvdG8z
"
));
"b25zZUI
sQg1Vbml0dGVzdFByb3RvqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQ
"
,
"
cm90b3NiBnByb3RvMw==
"
));
descriptor
=
pbr
::
FileDescriptor
.
FromGeneratedCode
(
descriptorData
,
new
pbr
::
FileDescriptor
[]
{
global
::
Google
.
Protobuf
.
TestProtos
.
UnittestImportProto3Reflection
.
Descriptor
,
},
new
pbr
::
GeneratedClrTypeInfo
(
new
[]
{
typeof
(
global
::
Google
.
Protobuf
.
TestProtos
.
ForeignEnum
),
typeof
(
global
::
Google
.
Protobuf
.
TestProtos
.
TestEnumWithDupValue
),
typeof
(
global
::
Google
.
Protobuf
.
TestProtos
.
TestSparseEnum
),
},
new
pbr
::
GeneratedClrTypeInfo
[]
{
...
...
This diff is collapsed.
Click to expand it.
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