More cleanup, based around searches for "Google.ProtocolBuffers"

- Remove some old proto2-based C#-only messages
- Remove the "build" directory which only contained out-of-date files
- Remove the csharp_namespace option from proto2 messages
- Change "Google.ProtocolBuffers" to "Google.Protobuf" in other messages

26 files changed, 8 insertions, 31 deletions

diff --git a/src/google/protobuf/any.proto b/src/google/protobuf/any.proto
index e1780fe5..458dfff2 100644
--- a/src/google/protobuf/any.proto
+++ b/src/google/protobuf/any.proto
@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "AnyProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 
diff --git a/src/google/protobuf/duration.proto b/src/google/protobuf/duration.proto
index e466341a..dc6b575f 100644
--- a/src/google/protobuf/duration.proto
+++ b/src/google/protobuf/duration.proto
@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "DurationProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 // A Duration represents a signed, fixed-length span of time represented
diff --git a/src/google/protobuf/field_mask.proto b/src/google/protobuf/field_mask.proto
index 35b1acc3..ad7a1dfa 100644
--- a/src/google/protobuf/field_mask.proto
+++ b/src/google/protobuf/field_mask.proto
@@ -34,7 +34,7 @@ package google.protobuf;
 option java_multiple_files = true;
 option java_outer_classname = "FieldMaskProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 
diff --git a/src/google/protobuf/map_lite_unittest.proto b/src/google/protobuf/map_lite_unittest.proto
index febfe5f6..c69e8d94 100644
--- a/src/google/protobuf/map_lite_unittest.proto
+++ b/src/google/protobuf/map_lite_unittest.proto
@@ -32,7 +32,6 @@ syntax = "proto2";
 
 option cc_enable_arenas = true;
 option optimize_for = LITE_RUNTIME;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import "google/protobuf/unittest_lite.proto";
 
diff --git a/src/google/protobuf/map_proto2_unittest.proto b/src/google/protobuf/map_proto2_unittest.proto
index 04ca6170..3d4af28e 100644
--- a/src/google/protobuf/map_proto2_unittest.proto
+++ b/src/google/protobuf/map_proto2_unittest.proto
@@ -36,8 +36,6 @@ syntax = "proto2";
 // In map_test_util.h we do "using namespace unittest = protobuf_unittest".
 package protobuf_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 enum Proto2MapEnum {
   PROTO2_MAP_ENUM_FOO   = 0;
   PROTO2_MAP_ENUM_BAR   = 1;
diff --git a/src/google/protobuf/map_unittest.proto b/src/google/protobuf/map_unittest.proto
index cbf747d9..b308c7ff 100644
--- a/src/google/protobuf/map_unittest.proto
+++ b/src/google/protobuf/map_unittest.proto
@@ -31,7 +31,6 @@
 syntax = "proto3";
 
 option cc_enable_arenas = true;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import "google/protobuf/unittest.proto";
 
diff --git a/src/google/protobuf/struct.proto b/src/google/protobuf/struct.proto
index cd102731..a0ec961d 100644
--- a/src/google/protobuf/struct.proto
+++ b/src/google/protobuf/struct.proto
@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "StructProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 
diff --git a/src/google/protobuf/timestamp.proto b/src/google/protobuf/timestamp.proto
index 381ff997..d49bd766 100644
--- a/src/google/protobuf/timestamp.proto
+++ b/src/google/protobuf/timestamp.proto
@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "TimestampProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 
diff --git a/src/google/protobuf/unittest.proto b/src/google/protobuf/unittest.proto
index 834c9b56..85fe6153 100644
--- a/src/google/protobuf/unittest.proto
+++ b/src/google/protobuf/unittest.proto
@@ -42,7 +42,6 @@ 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.ProtocolBuffers.TestProtos";
 
 import "google/protobuf/unittest_import.proto";
 
diff --git a/src/google/protobuf/unittest_custom_options.proto b/src/google/protobuf/unittest_custom_options.proto
index 8f9fb582..d4d6e869 100644
--- a/src/google/protobuf/unittest_custom_options.proto
+++ b/src/google/protobuf/unittest_custom_options.proto
@@ -41,7 +41,6 @@ syntax = "proto2";
 option cc_generic_services = true;     // auto-added
 option java_generic_services = true;   // auto-added
 option py_generic_services = true;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // A custom file option (defined below).
 option (file_opt1) = 9876543210;
diff --git a/src/google/protobuf/unittest_drop_unknown_fields.proto b/src/google/protobuf/unittest_drop_unknown_fields.proto
index faaddc6e..8aa3a37b 100644
--- a/src/google/protobuf/unittest_drop_unknown_fields.proto
+++ b/src/google/protobuf/unittest_drop_unknown_fields.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 package unittest_drop_unknown_fields;
 option objc_class_prefix = "DropUnknowns";
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
+option csharp_namespace = "Google.Protobuf.TestProtos";
 
 message Foo {
   enum NestedEnum {
diff --git a/src/google/protobuf/unittest_embed_optimize_for.proto b/src/google/protobuf/unittest_embed_optimize_for.proto
index c4ccccb7..d8b0f9b9 100644
--- a/src/google/protobuf/unittest_embed_optimize_for.proto
+++ b/src/google/protobuf/unittest_embed_optimize_for.proto
@@ -39,8 +39,6 @@ import "google/protobuf/unittest_optimize_for.proto";
 
 package protobuf_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 // We optimize for speed here, but we are importing a proto that is optimized
 // for code size.
 option optimize_for = SPEED;
diff --git a/src/google/protobuf/unittest_enormous_descriptor.proto b/src/google/protobuf/unittest_enormous_descriptor.proto
index f8fcc9c0..6e65dc18 100644
--- a/src/google/protobuf/unittest_enormous_descriptor.proto
+++ b/src/google/protobuf/unittest_enormous_descriptor.proto
@@ -40,7 +40,6 @@ syntax = "proto2";
 
 package google.protobuf;
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // Avoid generating insanely long methods.
 option optimize_for = CODE_SIZE;
diff --git a/src/google/protobuf/unittest_import.proto b/src/google/protobuf/unittest_import.proto
index ae2e90b8..7e165220 100644
--- a/src/google/protobuf/unittest_import.proto
+++ b/src/google/protobuf/unittest_import.proto
@@ -47,7 +47,6 @@ option cc_enable_arenas = true;
 
 // Exercise the java_package option.
 option java_package = "com.google.protobuf.test";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // Do not set a java_outer_classname here to verify that Proto2 works without
 // one.
diff --git a/src/google/protobuf/unittest_import_lite.proto b/src/google/protobuf/unittest_import_lite.proto
index ca208582..a7afa452 100644
--- a/src/google/protobuf/unittest_import_lite.proto
+++ b/src/google/protobuf/unittest_import_lite.proto
@@ -38,7 +38,6 @@ package protobuf_unittest_import;
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import public "google/protobuf/unittest_import_public_lite.proto";
 
diff --git a/src/google/protobuf/unittest_import_public.proto b/src/google/protobuf/unittest_import_public.proto
index 0bc5d617..ffaf7736 100644
--- a/src/google/protobuf/unittest_import_public.proto
+++ b/src/google/protobuf/unittest_import_public.proto
@@ -35,7 +35,6 @@ syntax = "proto2";
 package protobuf_unittest_import;
 
 option java_package = "com.google.protobuf.test";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message PublicImportMessage {
   optional int32 e = 1;
diff --git a/src/google/protobuf/unittest_import_public_lite.proto b/src/google/protobuf/unittest_import_public_lite.proto
index 231ab9dd..33549c22 100644
--- a/src/google/protobuf/unittest_import_public_lite.proto
+++ b/src/google/protobuf/unittest_import_public_lite.proto
@@ -37,7 +37,6 @@ package protobuf_unittest_import;
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message PublicImportMessageLite {
   optional int32 e = 1;
diff --git a/src/google/protobuf/unittest_lite.proto b/src/google/protobuf/unittest_lite.proto
index 0040874b..662c0e46 100644
--- a/src/google/protobuf/unittest_lite.proto
+++ b/src/google/protobuf/unittest_lite.proto
@@ -40,7 +40,6 @@ import "google/protobuf/unittest_import_lite.proto";
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // Same as TestAllTypes but with the lite runtime.
 message TestAllTypesLite {
diff --git a/src/google/protobuf/unittest_lite_imports_nonlite.proto b/src/google/protobuf/unittest_lite_imports_nonlite.proto
index d955cc14..132d6a82 100644
--- a/src/google/protobuf/unittest_lite_imports_nonlite.proto
+++ b/src/google/protobuf/unittest_lite_imports_nonlite.proto
@@ -38,7 +38,6 @@ package protobuf_unittest;
 import "google/protobuf/unittest.proto";
 
 option optimize_for = LITE_RUNTIME;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message TestLiteImportsNonlite {
   optional TestAllTypes message = 1;
diff --git a/src/google/protobuf/unittest_mset.proto b/src/google/protobuf/unittest_mset.proto
index 425c9a5a..3aa31fa9 100644
--- a/src/google/protobuf/unittest_mset.proto
+++ b/src/google/protobuf/unittest_mset.proto
@@ -39,7 +39,6 @@ package protobuf_unittest;
 
 option cc_enable_arenas = true;
 option optimize_for = SPEED;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // A message with message_set_wire_format.
 message TestMessageSet {
diff --git a/src/google/protobuf/unittest_no_field_presence.proto b/src/google/protobuf/unittest_no_field_presence.proto
index f5cc4cc3..994afff4 100644
--- a/src/google/protobuf/unittest_no_field_presence.proto
+++ b/src/google/protobuf/unittest_no_field_presence.proto
@@ -37,8 +37,6 @@ import "google/protobuf/unittest.proto";
 
 package proto2_nofieldpresence_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos.Proto3";
-
 // This proto includes every type of field in both singular and repeated
 // forms.
 message TestAllTypes {
diff --git a/src/google/protobuf/unittest_optimize_for.proto b/src/google/protobuf/unittest_optimize_for.proto
index 2bcd16e4..ee9cc7bd 100644
--- a/src/google/protobuf/unittest_optimize_for.proto
+++ b/src/google/protobuf/unittest_optimize_for.proto
@@ -40,7 +40,6 @@ import "google/protobuf/unittest.proto";
 package protobuf_unittest;
 
 option optimize_for = CODE_SIZE;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message TestOptimizedForSize {
   optional int32 i = 1;
diff --git a/src/google/protobuf/unittest_preserve_unknown_enum.proto b/src/google/protobuf/unittest_preserve_unknown_enum.proto
index abc3de28..2f91332c 100644
--- a/src/google/protobuf/unittest_preserve_unknown_enum.proto
+++ b/src/google/protobuf/unittest_preserve_unknown_enum.proto
@@ -33,7 +33,7 @@ syntax = "proto3";
 package proto3_preserve_unknown_enum_unittest;
 option objc_class_prefix = "UnknownEnums";
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
+option csharp_namespace = "Google.Protobuf.TestProtos";
 
 enum MyEnum {
   FOO = 0;
diff --git a/src/google/protobuf/unittest_preserve_unknown_enum2.proto b/src/google/protobuf/unittest_preserve_unknown_enum2.proto
index 168b2407..adf42968 100644
--- a/src/google/protobuf/unittest_preserve_unknown_enum2.proto
+++ b/src/google/protobuf/unittest_preserve_unknown_enum2.proto
@@ -32,8 +32,6 @@ syntax = "proto2";
 
 package proto2_preserve_unknown_enum_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 enum MyEnum {
   FOO = 0;
   BAR = 1;
diff --git a/src/google/protobuf/unknown_enum_test.proto b/src/google/protobuf/unknown_enum_test.proto
index 3c549cc7..0ea1ede3 100644
--- a/src/google/protobuf/unknown_enum_test.proto
+++ b/src/google/protobuf/unknown_enum_test.proto
@@ -36,8 +36,6 @@ syntax = "proto2";
 
 package google.protobuf.util;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 message DownRevision {
   enum Enum {
     DEFAULT_VALUE = 2;
diff --git a/src/google/protobuf/wrappers.proto b/src/google/protobuf/wrappers.proto
index a13e6edb..14725524 100644
--- a/src/google/protobuf/wrappers.proto
+++ b/src/google/protobuf/wrappers.proto
@@ -40,7 +40,7 @@ package google.protobuf;
 option java_multiple_files = true;
 option java_outer_classname = "WrappersProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";