From 41c175e7115fca70bcfdcd8b333bd07b58fd874f Mon Sep 17 00:00:00 2001
From: Jie Luo <anandolee@gmail.com>
Date: Fri, 1 May 2015 10:12:54 -0700
Subject: Change field_presence_test.proto

---
 csharp/protos/google/protobuf/field_presence_test.proto     | 5 +----
 csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/csharp/protos/google/protobuf/field_presence_test.proto b/csharp/protos/google/protobuf/field_presence_test.proto
index 41a9a5cc..14d91312 100644
--- a/csharp/protos/google/protobuf/field_presence_test.proto
+++ b/csharp/protos/google/protobuf/field_presence_test.proto
@@ -2,10 +2,7 @@ syntax = "proto3";
 
 package Google.ProtocolBuffers.TestProtos.FieldPresence;
 
-option java_package = "com.google.protobuf";
-option java_outer_classname = "FieldPresenceTestProto";
-option java_generate_equals_and_hash = true;
-
+// TODO(jieluo): Add repeated fields, oneof, maps to TestAllTypes 
 message TestAllTypes {
   enum NestedEnum {
     FOO = 0;
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs
index a32630ed..b4cb279d 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs
@@ -41,8 +41,7 @@ namespace Google.ProtocolBuffers.TestProtos.FieldPresence {
             "c3NhZ2UYBSABKAsySy5Hb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90", 
             "b3MuRmllbGRQcmVzZW5jZS5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZRoe", 
             "Cg1OZXN0ZWRNZXNzYWdlEg0KBXZhbHVlGAEgASgFIicKCk5lc3RlZEVudW0S", 
-            "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJCMAoTY29tLmdvb2dsZS5wcm90", 
-          "b2J1ZkIWRmllbGRQcmVzZW5jZVRlc3RQcm90b6ABAWIGcHJvdG8z"));
+          "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJiBnByb3RvMw=="));
       pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
         descriptor = root;
         internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor = Descriptor.MessageTypes[0];
-- 
cgit v1.2.3