csharp: add support for the json_name option
Conflicts:
csharp/src/Google.Protobuf/JsonFormatter.cs
diff --git a/csharp/protos/unittest_issues.proto b/csharp/protos/unittest_issues.proto
index 989b3dc..f120516 100644
--- a/csharp/protos/unittest_issues.proto
+++ b/csharp/protos/unittest_issues.proto
@@ -116,4 +116,11 @@
string o2_string = 3;
}
-}
\ No newline at end of file
+}
+
+message TestJsonName {
+ // json_name field options are not properly handled during deserialization
+ string name = 1;
+ string description = 2 [json_name = "desc"];
+ string guid = 3 [json_name = "exid"];
+}
