Browse Source

Merge pull request #1960 from jskeet/oneof

Regenerate conformance files to include extra oneof fields.
Thomas Van Lenten 9 years ago
parent
commit
336ee28b34

+ 0 - 20
conformance/failure_list_csharp.txt

@@ -5,23 +5,3 @@ JsonInput.FieldNameWithMixedCases.JsonOutput
 JsonInput.FieldNameWithMixedCases.ProtobufOutput
 JsonInput.FieldNameWithMixedCases.Validator
 JsonInput.OriginalProtoFieldName.JsonOutput
-JsonInput.OneofZeroBool.JsonOutput
-JsonInput.OneofZeroBool.ProtobufOutput
-JsonInput.OneofZeroDouble.JsonOutput
-JsonInput.OneofZeroDouble.ProtobufOutput
-JsonInput.OneofZeroEnum.JsonOutput
-JsonInput.OneofZeroEnum.ProtobufOutput
-JsonInput.OneofZeroFloat.JsonOutput
-JsonInput.OneofZeroFloat.ProtobufOutput
-JsonInput.OneofZeroUint64.JsonOutput
-JsonInput.OneofZeroUint64.ProtobufOutput
-ProtobufInput.OneofZeroBool.JsonOutput
-ProtobufInput.OneofZeroBool.ProtobufOutput
-ProtobufInput.OneofZeroDouble.JsonOutput
-ProtobufInput.OneofZeroDouble.ProtobufOutput
-ProtobufInput.OneofZeroEnum.JsonOutput
-ProtobufInput.OneofZeroEnum.ProtobufOutput
-ProtobufInput.OneofZeroFloat.JsonOutput
-ProtobufInput.OneofZeroFloat.ProtobufOutput
-ProtobufInput.OneofZeroUint64.JsonOutput
-ProtobufInput.OneofZeroUint64.ProtobufOutput

File diff suppressed because it is too large
+ 85 - 82
csharp/src/Google.Protobuf.Conformance/Conformance.cs


Some files were not shown because too many files changed in this diff