Remove csharp tests from appveyor.

Change-Id: Ifeaa1bbc946ea5160d1a132004ff3862a7112795

.travis.yml

@@ -6,87 +6,12 @@ sudo: required
 language: cpp
 os:
   - linux
-  - osx
-# The Objective C build needs Xcode 7.0 or later.
-osx_image: xcode7.3
 script:
   - ./tests.sh $CONFIG
 env:
   - CONFIG=cpp
   - CONFIG=cpp_distcheck
-  - CONFIG=golang
-  - CONFIG=java_jdk6
   - CONFIG=java_jdk7
-  - CONFIG=java_oracle7
-  - CONFIG=javanano_jdk6
-  - CONFIG=javanano_jdk7
-  - CONFIG=javanano_oracle7
-  - CONFIG=javascript
-  # iOS build log was starting to choke travis UI, so split to cover the
-  # Xcode Debug and Release Configurations independently.
-  - CONFIG=objectivec_ios_debug
-  - CONFIG=objectivec_ios_release
-  - CONFIG=objectivec_osx
-  - CONFIG=objectivec_cocoapods_integration
   - CONFIG=python
-  - CONFIG=python_cpp
-  - CONFIG=ruby19
-  - CONFIG=ruby20
-  - CONFIG=ruby21
-  - CONFIG=ruby22
-  - CONFIG=jruby
-matrix:
-  exclude:
-    # It's nontrivial to programmatically install a new JDK from the command
-    # line on OS X, so we rely on testing on Linux for Java code.
-    - os: osx
-      env: CONFIG=java_jdk6
-    - os: osx
-      env: CONFIG=java_jdk7
-    - os: osx
-      env: CONFIG=java_oracle7
-    - os: osx
-      env: CONFIG=javanano_jdk6
-    - os: osx
-      env: CONFIG=javanano_jdk7
-    - os: osx
-      env: CONFIG=javanano_oracle7
-    # Requires installing golang, currently travis.sh is doing that with apt-get
-    # which doesn't work on OS X.
-    - os: osx
-      env: CONFIG=golang
-    # OS X/iOS tests of Objective C (needs Xcode, so it won't work on other
-    # platforms).
-    - os: linux
-      env: CONFIG=objectivec_ios_debug
-    - os: linux
-      env: CONFIG=objectivec_ios_release
-    - os: linux
-      env: CONFIG=objectivec_osx
-    - os: linux
-      env: CONFIG=objectivec_cocoapods_integration
-  # The dotnet environment requires Ubuntu 14.04 or 16.04. This
-  # configuration is effectively an "extra" one, outside the
-  # autogenerated matrix.
-  include:
-    - os: linux
-      env: CONFIG=csharp
-      dist: trusty
-  allow_failures:
-    # These currently do not work on OS X but are being worked on by @haberman.
-    - os: osx
-      env: CONFIG=ruby22
-    - os: osx
-      env: CONFIG=jruby
-    # https://github.com/google/protobuf/issues/1253 - Started failing when
-    # we moved to an OS X image that is 10.11.
-    - os: osx
-      env: CONFIG=python_cpp
-    # Mark the iOS test as flakey as xcodebuild some times fails to start the
-    # iOS Simulator.
-    - os: osx
-      env: CONFIG=objectivec_ios_debug
-    - os: osx
-      env: CONFIG=objectivec_ios_release
 notifications:
   email: false

Makefile.am

@@ -48,138 +48,6 @@ clean-local:
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = protobuf.pc protobuf-lite.pc
 
-csharp_EXTRA_DIST=                                                           \
-  csharp/.gitignore                                                          \
-  csharp/CHANGES.txt                                                         \
-  csharp/README.md                                                           \
-  csharp/build_packages.bat                                                  \
-  csharp/buildall.sh                                                         \
-  csharp/generate_protos.sh                                                  \
-  csharp/keys/Google.Protobuf.public.snk                                     \
-  csharp/keys/README.md                                                      \
-  csharp/protos/unittest_issues.proto                                        \
-  csharp/src/AddressBook/AddPerson.cs                                        \
-  csharp/src/AddressBook/Addressbook.cs                                      \
-  csharp/src/AddressBook/AddressBook.xproj                                   \
-  csharp/src/AddressBook/ListPeople.cs                                       \
-  csharp/src/AddressBook/Program.cs                                          \
-  csharp/src/AddressBook/SampleUsage.cs                                      \
-  csharp/src/AddressBook/project.json                                        \
-  csharp/src/Google.Protobuf.Conformance/Conformance.cs                      \
-  csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.xproj   \
-  csharp/src/Google.Protobuf.Conformance/Program.cs                          \
-  csharp/src/Google.Protobuf.Conformance/project.json                        \
-  csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.xproj         \
-  csharp/src/Google.Protobuf.JsonDump/Program.cs                             \
-  csharp/src/Google.Protobuf.JsonDump/project.json                           \
-  csharp/src/Google.Protobuf.Test/ByteStringTest.cs                          \
-  csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs              \
-  csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs                    \
-  csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs                   \
-  csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs                \
-  csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs           \
-  csharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs \
-  csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs        \
-  csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs                    \
-  csharp/src/Google.Protobuf.Test/EqualityTester.cs                          \
-  csharp/src/Google.Protobuf.Test/FieldCodecTest.cs                          \
-  csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs                    \
-  csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj                 \
-  csharp/src/Google.Protobuf.Test/IssuesTest.cs                              \
-  csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs                       \
-  csharp/src/Google.Protobuf.Test/JsonParserTest.cs                          \
-  csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs                       \
-  csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs              \
-  csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs              \
-  csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs             \
-  csharp/src/Google.Protobuf.Test/SampleEnum.cs                              \
-  csharp/src/Google.Protobuf.Test/SampleMessages.cs                          \
-  csharp/src/Google.Protobuf.Test/TestCornerCases.cs                         \
-  csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs            \
-  csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs         \
-  csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs   \
-  csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs               \
-  csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs               \
-  csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs       \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs                  \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs             \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs            \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs             \
-  csharp/src/Google.Protobuf.Test/project.json                               \
-  csharp/src/Google.Protobuf.sln                                             \
-  csharp/src/Google.Protobuf/ByteArray.cs                                    \
-  csharp/src/Google.Protobuf/ByteString.cs                                   \
-  csharp/src/Google.Protobuf/CodedInputStream.cs                             \
-  csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs                \
-  csharp/src/Google.Protobuf/CodedOutputStream.cs                            \
-  csharp/src/Google.Protobuf/Collections/MapField.cs                         \
-  csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs               \
-  csharp/src/Google.Protobuf/Collections/RepeatedField.cs                    \
-  csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs         \
-  csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs                 \
-  csharp/src/Google.Protobuf/FieldCodec.cs                                   \
-  csharp/src/Google.Protobuf/FrameworkPortability.cs                         \
-  csharp/src/Google.Protobuf/Google.Protobuf.xproj                           \
-  csharp/src/Google.Protobuf/IDeepCloneable.cs                               \
-  csharp/src/Google.Protobuf/IMessage.cs                                     \
-  csharp/src/Google.Protobuf/InvalidJsonException.cs                         \
-  csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs               \
-  csharp/src/Google.Protobuf/JsonFormatter.cs                                \
-  csharp/src/Google.Protobuf/JsonParser.cs                                   \
-  csharp/src/Google.Protobuf/JsonToken.cs                                    \
-  csharp/src/Google.Protobuf/JsonTokenizer.cs                                \
-  csharp/src/Google.Protobuf/LimitedInputStream.cs                           \
-  csharp/src/Google.Protobuf/MessageExtensions.cs                            \
-  csharp/src/Google.Protobuf/MessageParser.cs                                \
-  csharp/src/Google.Protobuf/ProtoPreconditions.cs                           \
-  csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs                      \
-  csharp/src/Google.Protobuf/Reflection/Descriptor.cs                        \
-  csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs     \
-  csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs                    \
-  csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs               \
-  csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs                 \
-  csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs                   \
-  csharp/src/Google.Protobuf/Reflection/FieldType.cs                         \
-  csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs                    \
-  csharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs              \
-  csharp/src/Google.Protobuf/Reflection/IDescriptor.cs                       \
-  csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs                    \
-  csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs                  \
-  csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs                  \
-  csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs                     \
-  csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs                   \
-  csharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs             \
-  csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/PartialClasses.cs                    \
-  csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs                    \
-  csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs             \
-  csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs               \
-  csharp/src/Google.Protobuf/Reflection/TypeRegistry.cs                      \
-  csharp/src/Google.Protobuf/WellKnownTypes/Any.cs                           \
-  csharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs                    \
-  csharp/src/Google.Protobuf/WellKnownTypes/Api.cs                           \
-  csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs                      \
-  csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs               \
-  csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs                         \
-  csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs                     \
-  csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs                 \
-  csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs                        \
-  csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs                \
-  csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs                     \
-  csharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs              \
-  csharp/src/Google.Protobuf/WellKnownTypes/Type.cs                          \
-  csharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs                  \
-  csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs                      \
-  csharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs               \
-  csharp/src/Google.Protobuf/WireFormat.cs                                   \
-  csharp/src/Google.Protobuf/project.json                                    \
-  csharp/src/packages/repositories.config
-
 java_EXTRA_DIST=                                                                   \
   java/README.md                                                                   \
   java/core/generate-sources-build.xml                                             \
@@ -200,6 +68,7 @@ java_EXTRA_DIST=
   java/core/src/main/java/com/google/protobuf/Descriptors.java                     \
   java/core/src/main/java/com/google/protobuf/DoubleArrayList.java                 \
   java/core/src/main/java/com/google/protobuf/DynamicMessage.java                  \
+  java/core/src/main/java/com/google/protobuf/ExperimentalApi.java                 \
   java/core/src/main/java/com/google/protobuf/Extension.java                       \
   java/core/src/main/java/com/google/protobuf/ExtensionLite.java                   \
   java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java               \
@@ -234,6 +103,7 @@ java_EXTRA_DIST=
   java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java             \
   java/core/src/main/java/com/google/protobuf/ProtocolStringList.java              \
   java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java            \
+  java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilderV3.java          \
   java/core/src/main/java/com/google/protobuf/RopeByteString.java                  \
   java/core/src/main/java/com/google/protobuf/RpcCallback.java                     \
   java/core/src/main/java/com/google/protobuf/RpcChannel.java                      \
@@ -242,6 +112,7 @@ java_EXTRA_DIST=
   java/core/src/main/java/com/google/protobuf/Service.java                         \
   java/core/src/main/java/com/google/protobuf/ServiceException.java                \
   java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java              \
+  java/core/src/main/java/com/google/protobuf/SingleFieldBuilderV3.java            \
   java/core/src/main/java/com/google/protobuf/SmallSortedMap.java                  \
   java/core/src/main/java/com/google/protobuf/TextFormat.java                      \
   java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java               \
@@ -252,6 +123,7 @@ java_EXTRA_DIST=
   java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java             \
   java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java      \
   java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java            \
+  java/core/src/main/java/com/google/protobuf/UnsafeUtil.java                      \
   java/core/src/main/java/com/google/protobuf/Utf8.java                            \
   java/core/src/main/java/com/google/protobuf/WireFormat.java                      \
   java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java             \
@@ -291,16 +163,20 @@ java_EXTRA_DIST=
   java/core/src/test/java/com/google/protobuf/MessageTest.java                     \
   java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java              \
   java/core/src/test/java/com/google/protobuf/NioByteStringTest.java               \
+  java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java             \
   java/core/src/test/java/com/google/protobuf/ParserTest.java                      \
   java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java           \
   java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java        \
+  java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java      \
   java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java     \
   java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java              \
   java/core/src/test/java/com/google/protobuf/ServiceTest.java                     \
   java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java          \
+  java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java        \
   java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java              \
   java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java              \
   java/core/src/test/java/com/google/protobuf/TestUtil.java                        \
+  java/core/src/test/java/com/google/protobuf/TestUtilLite.java                    \
   java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java     \
   java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java     \
   java/core/src/test/java/com/google/protobuf/TextFormatTest.java                  \
@@ -332,193 +208,23 @@ java_EXTRA_DIST=
   java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto          \
   java/core/src/test/proto/com/google/protobuf/test_custom_options.proto           \
   java/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto         \
+  java/lite/generate-sources-build.xml                                             \
+  java/lite/generate-test-sources-build.xml                                        \
   java/lite/pom.xml                                                                \
   java/pom.xml                                                                     \
   java/util/pom.xml                                                                \
+  java/util/src/main/java/com/google/protobuf/util/Durations.java                  \
   java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java              \
   java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java              \
   java/util/src/main/java/com/google/protobuf/util/JsonFormat.java                 \
   java/util/src/main/java/com/google/protobuf/util/TimeUtil.java                   \
+  java/util/src/main/java/com/google/protobuf/util/Timestamps.java                 \
   java/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java          \
   java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java          \
   java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java             \
   java/util/src/test/java/com/google/protobuf/util/TimeUtilTest.java               \
   java/util/src/test/proto/com/google/protobuf/util/json_test.proto
 
-javanano_EXTRA_DIST=                                                                      \
-  javanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java          \
-  javanano/src/main/java/com/google/protobuf/nano/FieldData.java                          \
-  javanano/src/main/java/com/google/protobuf/nano/FieldArray.java                         \
-  javanano/src/main/java/com/google/protobuf/nano/WireFormatNano.java                     \
-  javanano/src/main/java/com/google/protobuf/nano/Extension.java                          \
-  javanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java           \
-  javanano/src/main/java/com/google/protobuf/nano/UnknownFieldData.java                   \
-  javanano/src/main/java/com/google/protobuf/nano/MessageNano.java                        \
-  javanano/src/main/java/com/google/protobuf/nano/InternalNano.java                       \
-  javanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java \
-  javanano/src/main/java/com/google/protobuf/nano/MapFactories.java                       \
-  javanano/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java              \
-  javanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java                 \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto           \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto          \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto     \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto  \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto                 \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto                     \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto  \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto              \
-  javanano/src/test/java/com/google/protobuf/nano/NanoTest.java                           \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto              \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_import_nano.proto              \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto      \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_extension_nano.proto           \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto  \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto  \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto           \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto    \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto       \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto          \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto            \
-  javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto \
-  javanano/src/test/java/com/google/protobuf/nano/map_test.proto                          \
-  javanano/README.md                                                                      \
-  javanano/pom.xml
-
-objectivec_EXTRA_DIST=                                                       \
-  objectivec/DevTools/check_version_stamps.sh                                \
-  objectivec/DevTools/compile_testing_protos.sh                              \
-  objectivec/DevTools/full_mac_build.sh                                      \
-  objectivec/DevTools/pddm.py                                                \
-  objectivec/DevTools/pddm_tests.py                                          \
-  objectivec/generate_well_known_types.sh                                    \
-  objectivec/google/protobuf/Any.pbobjc.h                                    \
-  objectivec/google/protobuf/Any.pbobjc.m                                    \
-  objectivec/google/protobuf/Api.pbobjc.h                                    \
-  objectivec/google/protobuf/Api.pbobjc.m                                    \
-  objectivec/google/protobuf/Duration.pbobjc.h                               \
-  objectivec/google/protobuf/Duration.pbobjc.m                               \
-  objectivec/google/protobuf/Empty.pbobjc.h                                  \
-  objectivec/google/protobuf/Empty.pbobjc.m                                  \
-  objectivec/google/protobuf/FieldMask.pbobjc.h                              \
-  objectivec/google/protobuf/FieldMask.pbobjc.m                              \
-  objectivec/google/protobuf/SourceContext.pbobjc.h                          \
-  objectivec/google/protobuf/SourceContext.pbobjc.m                          \
-  objectivec/google/protobuf/Struct.pbobjc.h                                 \
-  objectivec/google/protobuf/Struct.pbobjc.m                                 \
-  objectivec/google/protobuf/Timestamp.pbobjc.h                              \
-  objectivec/google/protobuf/Timestamp.pbobjc.m                              \
-  objectivec/google/protobuf/Type.pbobjc.h                                   \
-  objectivec/google/protobuf/Type.pbobjc.m                                   \
-  objectivec/google/protobuf/Wrappers.pbobjc.h                               \
-  objectivec/google/protobuf/Wrappers.pbobjc.m                               \
-  objectivec/GPBArray.h                                                      \
-  objectivec/GPBArray.m                                                      \
-  objectivec/GPBArray_PackagePrivate.h                                       \
-  objectivec/GPBBootstrap.h                                                  \
-  objectivec/GPBCodedInputStream.h                                           \
-  objectivec/GPBCodedInputStream.m                                           \
-  objectivec/GPBCodedInputStream_PackagePrivate.h                            \
-  objectivec/GPBCodedOutputStream.h                                          \
-  objectivec/GPBCodedOutputStream.m                                          \
-  objectivec/GPBCodedOutputStream_PackagePrivate.h                           \
-  objectivec/GPBDescriptor.h                                                 \
-  objectivec/GPBDescriptor.m                                                 \
-  objectivec/GPBDescriptor_PackagePrivate.h                                  \
-  objectivec/GPBDictionary.h                                                 \
-  objectivec/GPBDictionary.m                                                 \
-  objectivec/GPBDictionary_PackagePrivate.h                                  \
-  objectivec/GPBExtensionInternals.h                                         \
-  objectivec/GPBExtensionInternals.m                                         \
-  objectivec/GPBExtensionRegistry.h                                          \
-  objectivec/GPBExtensionRegistry.m                                          \
-  objectivec/GPBMessage.h                                                    \
-  objectivec/GPBMessage.m                                                    \
-  objectivec/GPBMessage_PackagePrivate.h                                     \
-  objectivec/GPBProtocolBuffers.h                                            \
-  objectivec/GPBProtocolBuffers.m                                            \
-  objectivec/GPBProtocolBuffers_RuntimeSupport.h                             \
-  objectivec/GPBRootObject.h                                                 \
-  objectivec/GPBRootObject.m                                                 \
-  objectivec/GPBRootObject_PackagePrivate.h                                  \
-  objectivec/GPBRuntimeTypes.h                                               \
-  objectivec/GPBUnknownField.h                                               \
-  objectivec/GPBUnknownField.m                                               \
-  objectivec/GPBUnknownField_PackagePrivate.h                                \
-  objectivec/GPBUnknownFieldSet.h                                            \
-  objectivec/GPBUnknownFieldSet.m                                            \
-  objectivec/GPBUnknownFieldSet_PackagePrivate.h                             \
-  objectivec/GPBUtilities.h                                                  \
-  objectivec/GPBUtilities.m                                                  \
-  objectivec/GPBUtilities_PackagePrivate.h                                   \
-  objectivec/GPBWellKnownTypes.h                                             \
-  objectivec/GPBWellKnownTypes.m                                             \
-  objectivec/GPBWireFormat.h                                                 \
-  objectivec/GPBWireFormat.m                                                 \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj                   \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj                   \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
-  objectivec/README.md                                                       \
-  objectivec/Tests/golden_message                                            \
-  objectivec/Tests/golden_packed_fields_message                              \
-  objectivec/Tests/GPBARCUnittestProtos.m                                    \
-  objectivec/Tests/GPBArrayTests.m                                           \
-  objectivec/Tests/GPBCodedInputStreamTests.m                                \
-  objectivec/Tests/GPBCodedOuputStreamTests.m                                \
-  objectivec/Tests/GPBConcurrencyTests.m                                     \
-  objectivec/Tests/GPBDescriptorTests.m                                      \
-  objectivec/Tests/GPBDictionaryTests+Bool.m                                 \
-  objectivec/Tests/GPBDictionaryTests+Int32.m                                \
-  objectivec/Tests/GPBDictionaryTests+Int64.m                                \
-  objectivec/Tests/GPBDictionaryTests+String.m                               \
-  objectivec/Tests/GPBDictionaryTests+UInt32.m                               \
-  objectivec/Tests/GPBDictionaryTests+UInt64.m                               \
-  objectivec/Tests/GPBDictionaryTests.pddm                                   \
-  objectivec/Tests/GPBMessageTests+Merge.m                                   \
-  objectivec/Tests/GPBMessageTests+Runtime.m                                 \
-  objectivec/Tests/GPBMessageTests+Serialization.m                           \
-  objectivec/Tests/GPBMessageTests.m                                         \
-  objectivec/Tests/GPBObjectiveCPlusPlusTest.mm                              \
-  objectivec/Tests/GPBPerfTests.m                                            \
-  objectivec/Tests/GPBSwiftTests.swift                                       \
-  objectivec/Tests/GPBTestUtilities.h                                        \
-  objectivec/Tests/GPBTestUtilities.m                                        \
-  objectivec/Tests/GPBUnittestProtos.m                                       \
-  objectivec/Tests/GPBUnknownFieldSetTest.m                                  \
-  objectivec/Tests/GPBUtilitiesTests.m                                       \
-  objectivec/Tests/GPBWellKnownTypesTest.m                                   \
-  objectivec/Tests/GPBWireFormatTests.m                                      \
-  objectivec/Tests/iOSTestHarness/AppDelegate.m                              \
-  objectivec/Tests/iOSTestHarness/en.lproj/InfoPlist.strings                 \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json      \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png          \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png       \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png          \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png       \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png        \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png     \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png     \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png     \
-  objectivec/Tests/iOSTestHarness/Images.xcassets/LaunchImage.launchimage/Contents.json \
-  objectivec/Tests/iOSTestHarness/Info.plist                                  \
-  objectivec/Tests/iOSTestHarness/LaunchScreen.xib                            \
-  objectivec/Tests/text_format_map_unittest_data.txt                          \
-  objectivec/Tests/text_format_unittest_data.txt                              \
-  objectivec/Tests/unittest_cycle.proto                                       \
-  objectivec/Tests/unittest_objc.proto                                        \
-  objectivec/Tests/unittest_objc_startup.proto                                \
-  objectivec/Tests/unittest_runtime_proto2.proto                              \
-  objectivec/Tests/unittest_runtime_proto3.proto                              \
-  objectivec/Tests/UnitTests-Bridging-Header.h                                \
-  objectivec/Tests/UnitTests-Info.plist                                       \
-  Protobuf.podspec
-
 python_EXTRA_DIST=                                                           \
   python/MANIFEST.in                                                         \
   python/google/__init__.py                                                  \
@@ -543,6 +249,7 @@ python_EXTRA_DIST=                                                           \
   python/google/protobuf/internal/enum_type_wrapper.py                       \
   python/google/protobuf/internal/factory_test1.proto                        \
   python/google/protobuf/internal/factory_test2.proto                        \
+  python/google/protobuf/internal/file_options_test.proto                    \
   python/google/protobuf/internal/generator_test.py                          \
   python/google/protobuf/internal/import_test_package/__init__.py            \
   python/google/protobuf/internal/import_test_package/inner.proto            \
@@ -595,6 +302,7 @@ python_EXTRA_DIST=                                                           \
   python/google/protobuf/pyext/map_container.h                               \
   python/google/protobuf/pyext/message.cc                                    \
   python/google/protobuf/pyext/message.h                                     \
+  python/google/protobuf/pyext/message_module.cc                             \
   python/google/protobuf/pyext/proto2_api_test.proto                         \
   python/google/protobuf/pyext/python.proto                                  \
   python/google/protobuf/pyext/python_protobuf.h                             \
@@ -615,89 +323,7 @@ python_EXTRA_DIST=                                                           \
   python/tox.ini                                                             \
   python/README.md
 
-ruby_EXTRA_DIST=                                                             \
-  ruby/Gemfile                                                               \
-  ruby/Gemfile.lock                                                          \
-  ruby/.gitignore                                                            \
-  ruby/README.md                                                             \
-  ruby/Rakefile                                                              \
-  ruby/ext/google/protobuf_c/defs.c                                          \
-  ruby/ext/google/protobuf_c/encode_decode.c                                 \
-  ruby/ext/google/protobuf_c/extconf.rb                                      \
-  ruby/ext/google/protobuf_c/map.c                                           \
-  ruby/ext/google/protobuf_c/message.c                                       \
-  ruby/ext/google/protobuf_c/protobuf.c                                      \
-  ruby/ext/google/protobuf_c/protobuf.h                                      \
-  ruby/ext/google/protobuf_c/repeated_field.c                                \
-  ruby/ext/google/protobuf_c/storage.c                                       \
-  ruby/ext/google/protobuf_c/upb.c                                           \
-  ruby/ext/google/protobuf_c/upb.h                                           \
-  ruby/google-protobuf.gemspec                                               \
-  ruby/lib/google/protobuf/message_exts.rb                                   \
-  ruby/lib/google/protobuf/repeated_field.rb                                 \
-  ruby/lib/google/protobuf.rb                                                \
-  ruby/pom.xml                                                               \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java              \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java           \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyEnumBuilderContext.java   \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java                 \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java      \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java                  \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyMessageBuilderContext.java \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java              \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyOneofBuilderContext.java  \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java      \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java             \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java        \
-  ruby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/Utils.java                    \
-  ruby/src/main/java/google/ProtobufJavaService.java                         \
-  ruby/src/main/sentinel.proto                                               \
-  ruby/tests/basic.rb                                                        \
-  ruby/tests/repeated_field_test.rb                                          \
-  ruby/tests/stress.rb                                                       \
-  ruby/tests/generated_code.proto                                            \
-  ruby/tests/generated_code_test.rb                                          \
-  ruby/travis-test.sh
-
-js_EXTRA_DIST=              \
-  js/README.md              \
-  js/binary/arith.js        \
-  js/binary/arith_test.js   \
-  js/binary/constants.js    \
-  js/binary/decoder.js      \
-  js/binary/decoder_test.js \
-  js/binary/encoder.js      \
-  js/binary/proto_test.js   \
-  js/binary/reader.js       \
-  js/binary/reader_test.js  \
-  js/binary/utils.js        \
-  js/binary/utils_test.js   \
-  js/binary/writer.js       \
-  js/binary/writer_test.js  \
-  js/data.proto             \
-  js/debug.js               \
-  js/debug_test.js          \
-  js/gulpfile.js            \
-  js/jasmine.json           \
-  js/message.js             \
-  js/message_test.js        \
-  js/node_loader.js         \
-  js/package.json           \
-  js/proto3_test.js         \
-  js/proto3_test.proto      \
-  js/test.proto             \
-  js/test2.proto            \
-  js/test3.proto            \
-  js/test4.proto            \
-  js/test5.proto            \
-  js/test_bootstrap.js      \
-  js/testbinary.proto       \
-  js/testempty.proto
-
-all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
+all_EXTRA_DIST=$(java_EXTRA_DIST) $(python_EXTRA_DIST)
 
 EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
   autogen.sh                             \
@@ -712,6 +338,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
   WORKSPACE                              \
   cmake/CMakeLists.txt                   \
   cmake/README.md                        \
+  cmake/examples.cmake                   \
   cmake/extract_includes.bat.in          \
   cmake/install.cmake                    \
   cmake/libprotobuf.cmake                \
@@ -720,11 +347,13 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
   cmake/protobuf-config-version.cmake.in \
   cmake/protobuf-config.cmake.in         \
   cmake/protobuf-module.cmake.in         \
+  cmake/protobuf-options.cmake           \
   cmake/protoc.cmake                     \
   cmake/tests.cmake                      \
   editors/README.txt                     \
   editors/proto.vim                      \
   editors/protobuf-mode.el               \
+  examples/CMakeLists.txt                \
   examples/README.txt                    \
   examples/Makefile                      \
   examples/addressbook.proto             \
@@ -734,6 +363,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
   examples/list_people.cc                \
   examples/list_people.go                \
   examples/AddPerson.java                \
+  examples/CMakeLists.txt                \
   examples/ListPeople.java               \
   examples/add_person.py                 \
   examples/list_people.py                \

Protobuf.podspec

@@ -1,40 +0,0 @@
-# This file describes to Cocoapods how to integrate the Objective-C runtime into a dependent
-# project.
-# Despite this file being specific to Objective-C, it needs to be on the root of the repository.
-# Otherwise, Cocoapods gives trouble like not picking up the license file correctly, or not letting
-# dependent projects use the :git notation to refer to the library.
-Pod::Spec.new do |s|
-  s.name     = 'Protobuf'
-  s.version  = '3.0.0-beta-4'
-  s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
-  s.homepage = 'https://github.com/google/protobuf'
-  s.license  = 'New BSD'
-  s.authors  = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
-  s.cocoapods_version = '>= 1.0'
-
-  s.source = { :git => 'https://github.com/google/protobuf.git',
-               :tag => "v#{s.version}" }
-
-  s.source_files = 'objectivec/*.{h,m}',
-                   'objectivec/google/protobuf/Any.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Api.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Duration.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Empty.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Struct.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Timestamp.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Type.pbobjc.{h,m}',
-                   'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}'
-  # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be
-  # left out, as it's an umbrella implementation file.
-  s.exclude_files = 'objectivec/GPBProtocolBuffers.m'
-
-  # Set a CPP symbol so the code knows to use framework imports.
-  s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
-  s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
-
-  s.ios.deployment_target = '7.1'
-  s.osx.deployment_target = '10.9'
-  s.requires_arc = false
-end

appveyor.yml

@@ -12,8 +12,6 @@ environment:
     - language: cpp
       BUILD_DLL: ON
 
-    - language: csharp
-
 # Our build scripts run tests automatically; we don't want AppVeyor
 # to try to detect them itself.
 test: off
@@ -22,8 +20,6 @@ install:
   - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip
   - 7z x gmock-1.7.0.zip
   - rename gmock-1.7.0 gmock
-  - ps: Start-FileDownload https://go.microsoft.com/fwlink/?LinkID=809122 -FileName dotnetsdk.exe
-  - dotnetsdk.exe /install /quiet /norestart
 
 before_build:
   - if %platform%==Win32 set generator=Visual Studio 12

cmake/extract_includes.bat.in

@@ -23,7 +23,6 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\command_line_
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\cpp\cpp_generator.h include\google\protobuf\compiler\cpp\cpp_generator.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_generator.h include\google\protobuf\compiler\csharp\csharp_generator.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_names.h include\google\protobuf\compiler\csharp\csharp_names.h
-copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_options.h include\google\protobuf\compiler\csharp\csharp_options.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\importer.h include\google\protobuf\compiler\importer.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_generator.h include\google\protobuf\compiler\java\java_generator.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_names.h include\google\protobuf\compiler\java\java_names.h
@@ -84,6 +83,7 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_intern
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_mips_gcc.h include\google\protobuf\stubs\atomicops_internals_mips_gcc.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_pnacl.h include\google\protobuf\stubs\atomicops_internals_pnacl.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_power.h include\google\protobuf\stubs\atomicops_internals_power.h
+copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_ppc_gcc.h include\google\protobuf\stubs\atomicops_internals_ppc_gcc.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_solaris.h include\google\protobuf\stubs\atomicops_internals_solaris.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_tsan.h include\google\protobuf\stubs\atomicops_internals_tsan.h
 copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.h include\google\protobuf\stubs\atomicops_internals_x86_gcc.h

configure.ac

@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.0.0-beta-4],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[2.7.0],[protobuf@googlegroups.com],[protobuf])
 
 AM_MAINTAINER_MODE([enable])
 
@@ -31,7 +31,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., make dist)])
 case "$DIST_LANG" in
   "") DIST_LANG=all ;;
-  all | cpp | csharp | java | python | javanano | objectivec | ruby | js) ;;
+  all | cpp | java | python) ;;
   *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;;
 esac
 AC_SUBST(DIST_LANG)

conformance/Makefile.am

@@ -18,9 +18,6 @@ protoc_outputs =                                               \
 
 other_language_protoc_outputs =                                \
   conformance_pb2.py                                           \
-  Conformance.pbobjc.h                                         \
-  Conformance.pbobjc.m                                         \
-  conformance.rb                                               \
   com/google/protobuf/Any.java                                 \
   com/google/protobuf/AnyOrBuilder.java                        \
   com/google/protobuf/AnyProto.java                            \
@@ -63,68 +60,22 @@ other_language_protoc_outputs =                                \
   com/google/protobuf/WrappersProto.java                       \
   google/protobuf/any.pb.cc                                    \
   google/protobuf/any.pb.h                                     \
-  google/protobuf/any.rb                                       \
   google/protobuf/any_pb2.py                                   \
   google/protobuf/duration.pb.cc                               \
   google/protobuf/duration.pb.h                                \
-  google/protobuf/duration.rb                                  \
   google/protobuf/duration_pb2.py                              \
   google/protobuf/field_mask.pb.cc                             \
   google/protobuf/field_mask.pb.h                              \
-  google/protobuf/field_mask.rb                                \
   google/protobuf/field_mask_pb2.py                            \
   google/protobuf/struct.pb.cc                                 \
   google/protobuf/struct.pb.h                                  \
-  google/protobuf/struct.rb                                    \
   google/protobuf/struct_pb2.py                                \
   google/protobuf/timestamp.pb.cc                              \
   google/protobuf/timestamp.pb.h                               \
-  google/protobuf/timestamp.rb                                 \
   google/protobuf/timestamp_pb2.py                             \
   google/protobuf/wrappers.pb.cc                               \
   google/protobuf/wrappers.pb.h                                \
-  google/protobuf/wrappers.rb                                  \
   google/protobuf/wrappers_pb2.py
-  # lite/com/google/protobuf/Any.java                            \
-  # lite/com/google/protobuf/AnyOrBuilder.java                   \
-  # lite/com/google/protobuf/AnyProto.java                       \
-  # lite/com/google/protobuf/BoolValue.java                      \
-  # lite/com/google/protobuf/BoolValueOrBuilder.java             \
-  # lite/com/google/protobuf/BytesValue.java                     \
-  # lite/com/google/protobuf/BytesValueOrBuilder.java            \
-  # lite/com/google/protobuf/conformance/Conformance.java        \
-  # lite/com/google/protobuf/DoubleValue.java                    \
-  # lite/com/google/protobuf/DoubleValueOrBuilder.java           \
-  # lite/com/google/protobuf/Duration.java                       \
-  # lite/com/google/protobuf/DurationOrBuilder.java              \
-  # lite/com/google/protobuf/DurationProto.java                  \
-  # lite/com/google/protobuf/FieldMask.java                      \
-  # lite/com/google/protobuf/FieldMaskOrBuilder.java             \
-  # lite/com/google/protobuf/FieldMaskProto.java                 \
-  # lite/com/google/protobuf/FloatValue.java                     \
-  # lite/com/google/protobuf/FloatValueOrBuilder.java            \
-  # lite/com/google/protobuf/Int32Value.java                     \
-  # lite/com/google/protobuf/Int32ValueOrBuilder.java            \
-  # lite/com/google/protobuf/Int64Value.java                     \
-  # lite/com/google/protobuf/Int64ValueOrBuilder.java            \
-  # lite/com/google/protobuf/ListValue.java                      \
-  # lite/com/google/protobuf/ListValueOrBuilder.java             \
-  # lite/com/google/protobuf/NullValue.java                      \
-  # lite/com/google/protobuf/StringValue.java                    \
-  # lite/com/google/protobuf/StringValueOrBuilder.java           \
-  # lite/com/google/protobuf/Struct.java                         \
-  # lite/com/google/protobuf/StructOrBuilder.java                \
-  # lite/com/google/protobuf/StructProto.java                    \
-  # lite/com/google/protobuf/Timestamp.java                      \
-  # lite/com/google/protobuf/TimestampOrBuilder.java             \
-  # lite/com/google/protobuf/TimestampProto.java                 \
-  # lite/com/google/protobuf/UInt32Value.java                    \
-  # lite/com/google/protobuf/UInt32ValueOrBuilder.java           \
-  # lite/com/google/protobuf/UInt64Value.java                    \
-  # lite/com/google/protobuf/UInt64ValueOrBuilder.java           \
-  # lite/com/google/protobuf/Value.java                          \
-  # lite/com/google/protobuf/ValueOrBuilder.java                 \
-  # lite/com/google/protobuf/WrappersProto.java
 
 bin_PROGRAMS = conformance-test-runner conformance-cpp
 
@@ -133,19 +84,14 @@ bin_PROGRAMS = conformance-test-runner conformance-cpp
 # automatically.
 EXTRA_DIST =                  \
   ConformanceJava.java        \
-  ConformanceJavaLite.java    \
   README.md                   \
   conformance.proto           \
   conformance_python.py       \
-  conformance_ruby.rb         \
   failure_list_cpp.txt        \
-  failure_list_csharp.txt     \
   failure_list_java.txt       \
-  failure_list_objc.txt       \
   failure_list_python.txt     \
   failure_list_python_cpp.txt \
-  failure_list_python-post26.txt \
-  failure_list_ruby.txt
+  failure_list_python-post26.txt
 
 conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la
 conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \
@@ -168,31 +114,11 @@ conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src
 # so a direct "make test_cpp" could fail if parallel enough.
 conformance_cpp-conformance_cpp.$(OBJEXT): conformance.pb.h
 
-if OBJC_CONFORMANCE_TEST
-
-bin_PROGRAMS += conformance-objc
-
-conformance_objc_SOURCES = conformance_objc.m ../objectivec/GPBProtocolBuffers.m
-nodist_conformance_objc_SOURCES = Conformance.pbobjc.m
-# On travis, the build fails without the isysroot because whatever system
-# headers are being found don't include generics support for
-# NSArray/NSDictionary, the only guess is their image at one time had an odd
-# setup for Xcode and old frameworks are being found.
-conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk macosx --show-sdk-path`
-conformance_objc_LDFLAGS = -framework Foundation
-# Explicit dep beacuse BUILT_SOURCES are only done before a "make all/check"
-# so a direct "make test_objc" could fail if parallel enough.
-conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h
-
-endif
-
 if USE_EXTERNAL_PROTOC
 
 # Some implementations include pre-generated versions of well-known types.
 protoc_middleman: $(conformance_protoc_inputs) $(well_known_type_protoc_inputs)
-	$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --objc_out=. --python_out=. $(conformance_protoc_inputs)
-	$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --python_out=. $(well_known_type_protoc_inputs)
-	## $(PROTOC) -I$(srcdir) -I$(top_srcdir) --java_out=lite:lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs)
+	$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --python_out=. $(conformance_protoc_inputs) $(well_known_type_protoc_inputs)
 	touch protoc_middleman
 
 else
@@ -215,7 +141,7 @@ $(other_language_protoc_outputs): protoc_middleman
 
 BUILT_SOURCES = $(protoc_outputs) $(other_language_protoc_outputs)
 
-CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java javac_middleman_lite conformance-java-lite conformance-csharp $(other_language_protoc_outputs)
+CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java $(other_language_protoc_outputs)
 
 MAINTAINERCLEANFILES =   \
   Makefile.in
@@ -230,25 +156,6 @@ conformance-java: javac_middleman
 	@jar=`ls ../java/util/target/*jar-with-dependencies.jar` && echo java -classpath .:../java/target/classes:$$jar ConformanceJava '$$@' >> conformance-java
 	@chmod +x conformance-java
 
-javac_middleman_lite: ConformanceJavaLite.java protoc_middleman $(other_language_protoc_outputs)
-	javac -classpath ../java/lite/target/classes:lite ConformanceJavaLite.java lite/com/google/protobuf/conformance/Conformance.java
-	@touch javac_middleman_lite
-
-conformance-java-lite: javac_middleman_lite
-	@echo "Writing shortcut script conformance-java-lite..."
-	@echo '#! /bin/sh' > conformance-java-lite
-	@echo java -classpath .:../java/lite/target/classes:lite ConformanceJavaLite '$$@' >> conformance-java-lite
-	@chmod +x conformance-java-lite
-
-# Currently the conformance code is alongside the rest of the C#
-# source, as it's easier to maintain there. We assume we've already
-# built that, so we just need a script to run it.
-conformance-csharp: $(other_language_protoc_outputs)
-	@echo "Writing shortcut script conformance-csharp..."
-	@echo '#! /bin/sh' > conformance-csharp
-	@echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp1.0/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp
-	@chmod +x conformance-csharp
-
 # Targets for actually running tests.
 test_cpp: protoc_middleman conformance-test-runner conformance-cpp
 	./conformance-test-runner --failure_list failure_list_cpp.txt ./conformance-cpp
@@ -256,15 +163,6 @@ test_cpp: protoc_middleman conformance-test-runner conformance-cpp
 test_java: protoc_middleman conformance-test-runner conformance-java
 	./conformance-test-runner --failure_list failure_list_java.txt ./conformance-java
 
-test_java_lite: protoc_middleman conformance-test-runner conformance-java-lite
-	./conformance-test-runner ./conformance-java-lite
-
-test_csharp: protoc_middleman conformance-test-runner conformance-csharp
-	./conformance-test-runner --failure_list failure_list_csharp.txt ./conformance-csharp
-
-test_ruby: protoc_middleman conformance-test-runner $(other_language_protoc_outputs)
-	RUBYLIB=../ruby/lib:. ./conformance-test-runner --failure_list failure_list_ruby.txt ./conformance_ruby.rb
-
 # These depend on library paths being properly set up.  The easiest way to
 # run them is to just use "tox" from the python dir.
 test_python: protoc_middleman conformance-test-runner
@@ -272,10 +170,3 @@ test_python: protoc_middleman conformance-test-runner
 
 test_python_cpp: protoc_middleman conformance-test-runner
 	./conformance-test-runner --failure_list failure_list_python_cpp.txt ./conformance_python.py
-
-if OBJC_CONFORMANCE_TEST
-
-test_objc: protoc_middleman conformance-test-runner conformance-objc
-	./conformance-test-runner --failure_list failure_list_objc.txt ./conformance-objc
-
-endif

csharp/.gitignore

@@ -1,31 +0,0 @@
-# Output
-bin
-obj
-project.lock.json
-TestResult.xml
-
-# Possibly legacy now?
-mono/bin
-mono/tmp
-mono/protoc
-build_output
-build_temp
-build/msbuild*.log
-lib/Microsoft.Silverlight.Testing
-lib/NUnit
-
-#
-# 	Untracked files
-#
-.vs
-*.user
-*.suo
-*.nupkg
-_ReSharper.*
-*.sln.cache
-mono/TestResult.xml
-mono/.libs
-mono/*.exe
-mono/*.dll
-lib/protoc.exe
-*.ncrunch*

csharp/CHANGES.txt

@@ -1,148 +0,0 @@
-===============================================================================
-Welcome to the C# port of Google Protocol Buffers, written by Jon Skeet
-(skeet@pobox.com) based on the work of many talented people.
-
-===============================================================================
-RELEASE NOTES - Code imported into Google's main protobuf repository
-===============================================================================
-
-Everything below note this represents history of protobuf-csharp-port project
-before the code was merged into csharp/ subtree of GitHub google/protobuf
-repository.
-Frozen legacy version of the original project is available in
-https://github.com/jskeet/protobuf-csharp-port.
-
-===============================================================================
-RELEASE NOTES - Version 2.4.1.555
-===============================================================================
-
-Changes:
-- Upgrade solution format to Visual Studio 2012.
-- Add the ability to print a builder (not just a message)
-- TextGenerator introduces a new overload of PrintTo
-- Munge protoc's error format into a VS-C#-compatible output format.
-- Work to make ProtoGen clone that acts as a protoc.exe plugin.
-- Added the AllowPartiallyTrustedCallers attribute
-- Optimized enum parsing.
-
-Fixes:
-- Fix for bug in limited input stream's Position, Introduced Position on 
-  output stream
-- Fix for writing a character to a JSON output overflows allocated buffer
-- Optimize FromBase64String to return Empty when presented with empty string.
-- Use string.Concat instead of operator to avoid potential import problems
-- Issue 81: quoting for NUnit parameters.
-- Issue 56: NuGet package is noisy
-- Issue 70: Portable library project has some invalid Nunit-based code.
-- Issue 71: CodedInputStream.ReadBytes go to slow path unnecessarily
-- Issue 84: warning CS0219: The variable `size' is assigned but never used
-
-===============================================================================
-RELEASE NOTES - Version 2.4.1.521
-===============================================================================
-
-Changes:
-- Add generated_code_attributes option, defaulted to false
-- Added support for Portable library
-- Added 'Unsafe' static type in ByteString to allow direct buffer access
-
-Fixes:
-- Issue 50: The XML serializer will fail to deserialize a message with empty 
-  child message
-- Issue 45: Use of 'item' as a field name causes AmbiguousMatchException
-- Issue 49: Generated nested static Types class should be partial
-- Issue 38: Disable CLSCompliant warnings (3021)
-- Issue 40: proto_path does not work for command-line file names
-- Issue 54: should retire all bytes in buffer (bufferSize)
-- Issue 43: Fix to correct identical 'umbrella_classname' options from trying 
-  to write to the same filename.
-
-===============================================================================
-RELEASE NOTES - Version 2.4.1.473
-===============================================================================
-
-Features:
-- Added option service_generator_type to control service generation with
-  NONE, GENERIC, INTERFACE, or IRPCDISPATCH
-- Added interfaces IRpcDispatch and IRpcServerStub to provide for blocking
-  services and implementations.
-- Added ProtoGen.exe command-line argument "--protoc_dir=" to specify the 
-  location of protoc.exe.
-- Extracted interfaces for ICodedInputStream and ICodedOutputStream to allow
-  custom implementation of writers with both speed and size optimizations.
-- Addition of the "Google.ProtoBuffers.Serialization" assembly to support
-  reading and writing messages to/from XML, JSON, IDictionary<,> and others.
-- Several performance related fixes and tweeks
-- Issue 3:	Add option to mark generated code with attribute
-- Issue 20:	Support for decorating classes [Serializable]
-- Issue 21:	Decorate fields with [deprecated=true] as [System.Obsolete]
-- Issue 22:	Reusable Builder classes
-- Issue 24:	Support for using Json/Xml formats with ICodedInputStream
-- Issue 25: Added support for NuGet packages
-- Issue 31: Upgraded protoc.exe and descriptor to 2.4.1
-
-Fixes:
-- Issue 13:	Message with Field same name as message causes uncompilable .cs
-- Issue 16:	Does not integrate well with other tooling
-- Issue 19:	Support for negative enum values
-- Issue 26:	AddRange in GeneratedBuilder iterates twice.
-- Issue 27:	Remove XML documentation output from test projects to clear 
-  warnings/errors.
-- Issue 28: Circular message dependencies result in null default values for 
-  Message fields.
-- Issue 29: Message classes generated have a public default constructor.  You
-  can disable private ctor generation with the option generate_private_ctor.
-- Issue 35: Fixed a bug in ProtoGen handling of arguments with trailing \
-- Big-endian support for float, and double on Silverlight
-- Packed and Unpacked parsing allow for all repeated, as per version 2.3
-- Fix for leaving Builder a public ctor on internal classes for use with
-  generic "where T: new()" constraints.
-
-Other:
-- Changed the code signing key to a privately held key
-- Reformatted all code and line-endings to C# defaults
-- Reworking of performance benchmarks to produce reliable results, option /v2
-- Issue 34: Silverlight assemblies are now unit tested
-
-===============================================================================
-RELEASE NOTES - Version 2.3.0.277
-===============================================================================
-
-Features:
-- Added cls_compliance option to generate attributes indicating 
-  non-CLS-compliance.
-- Added file_extension option to control the generated output file's extension.
-- Added umbrella_namespace option to place the umbrella class into a nested
-  namespace to address issues with proto files having the same name as a 
-  message it contains.
-- Added output_directory option to set the output path for the source file(s).
-- Added ignore_google_protobuf option to avoid generating code for includes 
-  from the google.protobuf package.
-- Added the LITE framework (Google.ProtoBuffersLite.dll) and the ability to
-  generate code with "option optimize_for = LITE_RUNTIME;".
-- Added ability to invoke protoc.exe from within ProtoGen.exe.
-- Upgraded to protoc.exe (2.3) compiler.
-
-Fixes:
-- Issue 9:	Class cannot be static and sealed error
-- Issue 12:	default value for enumerate fields must be filled out
-
-Other:
-- Rewrite of build using MSbuild instead of NAnt
-- Moved to NUnit Version 2.2.8.0
-- Changed to using secure .snk for releases
-
-===============================================================================
-RELEASE NOTES - Version 0.9.1
-===============================================================================
-
-Fixes:
-- issue 10:	Incorrect encoding of packed fields when serialized
-
-===============================================================================
-RELEASE NOTES - Version 0.9.0
-===============================================================================
-
-- Initial release
-
-===============================================================================

csharp/Google.Protobuf.Tools.nuspec

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package>
-  <metadata>
-    <id>Google.Protobuf.Tools</id>
-    <title>Google Protocol Buffers tools</title>
-    <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
-    <description>See project site for more info.</description>
-    <version>3.0.0-beta4</version>
-    <authors>Google Inc.</authors>
-    <owners>protobuf-packages</owners>
-    <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/google/protobuf</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>Tools for Protocol Buffers</releaseNotes>
-    <copyright>Copyright 2015, Google Inc.</copyright>
-    <tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags>
-  </metadata>
-  <files>
-    <file src="protoc\windows_x86\protoc.exe" target="tools\windows_x86\protoc.exe" />
-    <file src="protoc\windows_x64\protoc.exe" target="tools\windows_x64\protoc.exe" />
-    <file src="protoc\linux_x86\protoc" target="tools\linux_x86\protoc" />
-    <file src="protoc\linux_x64\protoc" target="tools\linux_x64\protoc" />
-    <file src="protoc\macosx_x86\protoc" target="tools\macosx_x86\protoc" />
-    <file src="protoc\macosx_x64\protoc" target="tools\macosx_x64\protoc" />
-    <file src="..\src\google\protobuf\any.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\api.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\descriptor.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\duration.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\empty.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\field_mask.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\source_context.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\struct.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\timestamp.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\type.proto" target="tools\google\protobuf" />
-    <file src="..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf" />
-  </files>
-</package>

csharp/README.md

@@ -1,70 +0,0 @@
-This directory contains the C# Protocol Buffers runtime library.
-
-Status: Beta - ready for external testing
-=========================================
-
-Usage
-=====
-
-The easiest way how to use C# protobufs is via the `Google.Protobuf`
-NuGet package. Just add the NuGet package to your VS project.
-
-You will also want to install the `Google.Protobuf.Tools` NuGet package, which
-contains precompiled version of `protoc.exe` and a copy of well known `.proto`
-files under the package's `tools` directory.
-
-To generate C# files from your `.proto` files, invoke `protoc` with the 
-`--csharp_out` option.
-
-Supported platforms
-===================
-
-The runtime library is built as a portable class library, supporting:
-
-- .NET 4.5
-- Windows 8
-- Windows Phone Silverlight 8
-- Windows Phone 8.1
-- .NET Core
-
-You should be able to use Protocol Buffers in Visual Studio 2012 and
-all later versions. This includes all code generated by `protoc`,
-which only uses features from C# 3 and earlier.
-
-Building
-========
-
-Open the `src/Google.Protobuf.sln` solution in Visual Studio 2015 or
-later. You should be able to run the NUnit test from Test Explorer
-(you might need to install NUnit Visual Studio add-in).
-
-Although *users* of this project are only expected to have Visual
-Studio 2012 or later, *developers* of the library are required to
-have Visual Studio 2015 or later, as the library uses C# 6 features
-in its implementation. These features have no impact when using the
-compiled code - they're only relevant when building the
-`Google.Protobuf` assembly.
-
-History of C# protobufs
-=======================
-
-This subtree was originally imported from https://github.com/jskeet/protobuf-csharp-port
-and represents the latest development version of C# protobufs, that will now be developed
-and maintained by Google. All the development will be done in open, under this repository
-(https://github.com/google/protobuf).
-
-The previous project differs from this project in a number of ways:
-
-- The old code only supported proto2; the new code only supports
-proto3 (so no unknown fields, no required/optional distinction, no
-extensions)
-- The old code was based on immutable message types and builders for
-them
-- The old code did not support maps or `oneof`
-- The old code had its own JSON representation, whereas the new code
-uses the standard protobuf JSON representation
-- The old code had no notion of the "well-known types" which have
-special support in the new code
-- The old project supported some older platforms (such as older
-versions of Silverlight) which are not currently supported in the
-new project

csharp/build_packages.bat

@@ -1,10 +0,0 @@
-@rem Builds Google.Protobuf NuGet packages
-
-dotnet restore src
-dotnet pack -c Release src\Google.Protobuf || goto :error
-
-goto :EOF
-
-:error
-echo Failed!
-exit /b %errorlevel%

csharp/buildall.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-CONFIG=Release
-SRC=$(dirname $0)/src
-
-set -ex
-
-echo Building relevant projects.
-dotnet build -c $CONFIG $SRC/Google.Protobuf $SRC/Google.Protobuf.Test $SRC/Google.Protobuf.Conformance
-
-echo Running tests.
-# Only test netcoreapp1.0, which uses the .NET Core runtime.
-# If we want to test the .NET 4.5 version separately, we could
-# run Mono explicitly. However, we don't have any differences between
-# the .NET 4.5 and netstandard1.0 assemblies.
-dotnet test -c $CONFIG -f netcoreapp1.0 $SRC/Google.Protobuf.Test

csharp/generate_protos.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-# Generates C# source files from .proto files.
-# You first need to make sure protoc has been built (see instructions on
-# building protoc in root of this repository)
-
-set -ex
-
-# cd to repository root
-pushd $(dirname $0)/..
-
-# Protocol buffer compiler to use. If the PROTOC variable is set,
-# use that. Otherwise, probe for expected locations under both
-# Windows and Unix.
-if [ -z "$PROTOC" ]; then
-  # TODO(jonskeet): Use an array and a for loop instead?
-  if [ -x cmake/build/Debug/protoc.exe ]; then
-    PROTOC=cmake/build/Debug/protoc.exe
-  elif [ -x cmake/build/Release/protoc.exe ]; then
-    PROTOC=cmake/build/Release/protoc.exe
-  elif [ -x src/protoc ]; then
-    PROTOC=src/protoc
-  else
-    echo "Unable to find protocol buffer compiler."
-    exit 1
-  fi
-fi
-
-# descriptor.proto and well-known types
-$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf \
-    --csharp_opt=base_namespace=Google.Protobuf \
-    src/google/protobuf/descriptor.proto \
-    src/google/protobuf/any.proto \
-    src/google/protobuf/api.proto \
-    src/google/protobuf/duration.proto \
-    src/google/protobuf/empty.proto \
-    src/google/protobuf/field_mask.proto \
-    src/google/protobuf/source_context.proto \
-    src/google/protobuf/struct.proto \
-    src/google/protobuf/timestamp.proto \
-    src/google/protobuf/type.proto \
-    src/google/protobuf/wrappers.proto
-
-# Test protos where the namespace matches the target location
-$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf.Test \
-    --csharp_opt=base_namespace=Google.Protobuf \
-    src/google/protobuf/map_unittest_proto3.proto \
-    src/google/protobuf/unittest_proto3.proto \
-    src/google/protobuf/unittest_import_proto3.proto \
-    src/google/protobuf/unittest_import_public_proto3.proto \
-    src/google/protobuf/unittest_well_known_types.proto
-
-# Different base namespace to the protos above
-$PROTOC -Icsharp/protos --csharp_out=csharp/src/Google.Protobuf.Test \
-    --csharp_opt=base_namespace=UnitTest.Issues \
-    csharp/protos/unittest_issues.proto
-
-# AddressBook sample protos
-$PROTOC -Iexamples --csharp_out=csharp/src/AddressBook \
-    examples/addressbook.proto
-
-$PROTOC -Iconformance -Isrc --csharp_out=csharp/src/Google.Protobuf.Conformance \
-    conformance/conformance.proto

csharp/keys/README.md

@@ -1,9 +0,0 @@
-Contents
---------
-
-- Google.Protobuf.public.snk:
-  Public key to verify strong name of Google.Protobuf assemblies.
-- Google.Protobuf.snk:
-  Signing key to provide strong name of Google.Protobuf assemblies.
-  As per [Microsoft guidance](https://msdn.microsoft.com/en-us/library/wd40t7ad(v=vs.110).aspx)
-  signing key should be checked into the repository.

csharp/protos/unittest_issues.proto

@@ -1,126 +0,0 @@
-syntax = "proto3";
-
-// These proto descriptors have at one time been reported as an issue or defect.
-// They are kept here to replicate the issue, and continue to verify the fix.
-
-// Issue: Non-"Google.Protobuffers" namespace will ensure that protobuffer library types are qualified
-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.
-message Issue307 {
-  message NestedOnce {
-    message NestedTwice {
-    }
-  }
-}
-
-// Old issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13
-// New issue 309: https://github.com/google/protobuf/issues/309
- 
-// message A {
-//    optional int32 _A = 1;
-// }
-
-// message B {
-//    optional int32 B_ = 1;
-// }
-
-//message AB {
-//    optional int32 a_b = 1;
-//}
-
-// Similar issue with numeric names
-// Java code failed too, so probably best for this to be a restriction.
-// See https://github.com/google/protobuf/issues/308
-// message NumberField {
-//    optional int32 _01 = 1;
-// }
-
-// issue 19 - negative enum values
-
-enum NegativeEnum {
-    NEGATIVE_ENUM_ZERO = 0;
-    FiveBelow = -5;
-    MinusOne = -1;
-}
-
-message NegativeEnumMessage {
-    NegativeEnum value = 1;
-    repeated NegativeEnum values = 2 [packed = false];
-    repeated NegativeEnum packed_values = 3 [packed=true];
-}
-
-// Issue 21: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=21
-// Decorate fields with [deprecated=true] as [System.Obsolete]
-
-message DeprecatedChild {
-}
-
-enum DeprecatedEnum {
-    DEPRECATED_ZERO = 0;
-    one = 1;
-}
-
-message DeprecatedFieldsMessage {
-    int32 PrimitiveValue = 1 [deprecated = true];
-    repeated int32 PrimitiveArray = 2 [deprecated = true];
-
-    DeprecatedChild MessageValue = 3 [deprecated = true];
-    repeated DeprecatedChild MessageArray = 4 [deprecated = true];
-
-    DeprecatedEnum EnumValue = 5 [deprecated = true];
-    repeated DeprecatedEnum EnumArray = 6 [deprecated = true];
-}
-
-// Issue 45: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=45
-message ItemField {
-  int32 item = 1;
-}
-
-message ReservedNames {
-  // Force a nested type called Types
-  message SomeNestedType {
-  }
-
-  int32 types = 1;
-  int32 descriptor = 2;
-}
-
-message TestJsonFieldOrdering {
-  // These fields are deliberately not declared in numeric
-  // order, and the oneof fields aren't contiguous either.
-  // This allows for reasonably robust tests of JSON output
-  // ordering.
-  // TestFieldOrderings in unittest_proto3.proto is similar,
-  // but doesn't include oneofs.
-  // TODO: Consider adding oneofs to TestFieldOrderings, although
-  // that will require fixing other tests in multiple platforms.
-  // Alternatively, consider just adding this to
-  // unittest_proto3.proto if multiple platforms want it.
-  
-  int32 plain_int32 = 4;
-
-  oneof o1 {
-    string o1_string = 2;
-    int32 o1_int32 = 5;
-  }
-  
-  string plain_string = 1;
-  
-  oneof o2 {
-    int32 o2_int32 = 6;
-    string o2_string = 3;
-  }
-  
-}
-
-message TestJsonName {
-  // Message for testing the effects for of the json_name option
-  string name = 1;
-  string description = 2 [json_name = "desc"];
-  string guid = 3 [json_name = "exid"];
-}

csharp/src/AddressBook/AddPerson.cs

@@ -1,132 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    internal class AddPerson
-    {
-        /// <summary>
-        /// Builds a person based on user input
-        /// </summary>
-        private static Person PromptForAddress(TextReader input, TextWriter output)
-        {
-            Person person = new Person();
-
-            output.Write("Enter person ID: ");
-            person.Id = int.Parse(input.ReadLine());
-
-            output.Write("Enter name: ");
-            person.Name = input.ReadLine();
-
-            output.Write("Enter email address (blank for none): ");
-            string email = input.ReadLine();
-            if (email.Length > 0)
-            {
-                person.Email = email;
-            }
-
-            while (true)
-            {
-                output.Write("Enter a phone number (or leave blank to finish): ");
-                string number = input.ReadLine();
-                if (number.Length == 0)
-                {
-                    break;
-                }
-
-                Person.Types.PhoneNumber phoneNumber = new Person.Types.PhoneNumber { Number = number };
-
-                output.Write("Is this a mobile, home, or work phone? ");
-                String type = input.ReadLine();
-                switch (type)
-                {
-                    case "mobile":
-                        phoneNumber.Type = Person.Types.PhoneType.Mobile;
-                        break;
-                    case "home":
-                        phoneNumber.Type = Person.Types.PhoneType.Home;
-                        break;
-                    case "work":
-                        phoneNumber.Type = Person.Types.PhoneType.Work;
-                        break;
-                    default:
-                        output.Write("Unknown phone type. Using default.");
-                        break;
-                }
-
-                person.Phones.Add(phoneNumber);
-            }
-            return person;
-        }
-
-        /// <summary>
-        /// Entry point - loads an existing addressbook or creates a new one,
-        /// then writes it back to the file.
-        /// </summary>
-        public static int Main(string[] args)
-        {
-            if (args.Length != 1)
-            {
-                Console.Error.WriteLine("Usage:  AddPerson ADDRESS_BOOK_FILE");
-                return -1;
-            }
-
-            AddressBook addressBook;
-
-            if (File.Exists(args[0]))
-            {
-                using (Stream file = File.OpenRead(args[0]))
-                {
-                    addressBook = AddressBook.Parser.ParseFrom(file);
-                }
-            }
-            else
-            {
-                Console.WriteLine("{0}: File not found. Creating a new file.", args[0]);
-                addressBook = new AddressBook();
-            }
-
-            // Add an address.
-            addressBook.People.Add(PromptForAddress(Console.In, Console.Out));
-
-            // Write the new address book back to disk.
-            using (Stream output = File.OpenWrite(args[0]))
-            {
-                addressBook.WriteTo(output);
-            }
-            return 0;
-        }
-    }
-}

csharp/src/AddressBook/AddressBook.xproj

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>afb63919-1e05-43b4-802a-8fb8c9b2f463</ProjectGuid>
-    <RootNamespace>AddressBook</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/src/AddressBook/Addressbook.cs

@@ -1,518 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: addressbook.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.Examples.AddressBook {
-
-  /// <summary>Holder for reflection information generated from addressbook.proto</summary>
-  public static partial class AddressbookReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for addressbook.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static AddressbookReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChFhZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwi1QEKBlBlcnNvbhIMCgRu",
-            "YW1lGAEgASgJEgoKAmlkGAIgASgFEg0KBWVtYWlsGAMgASgJEiwKBnBob25l",
-            "cxgEIAMoCzIcLnR1dG9yaWFsLlBlcnNvbi5QaG9uZU51bWJlchpHCgtQaG9u",
-            "ZU51bWJlchIOCgZudW1iZXIYASABKAkSKAoEdHlwZRgCIAEoDjIaLnR1dG9y",
-            "aWFsLlBlcnNvbi5QaG9uZVR5cGUiKwoJUGhvbmVUeXBlEgoKBk1PQklMRRAA",
-            "EggKBEhPTUUQARIICgRXT1JLEAIiLwoLQWRkcmVzc0Jvb2sSIAoGcGVvcGxl",
-            "GAEgAygLMhAudHV0b3JpYWwuUGVyc29uQlAKFGNvbS5leGFtcGxlLnR1dG9y",
-            "aWFsQhFBZGRyZXNzQm9va1Byb3Rvc6oCJEdvb2dsZS5Qcm90b2J1Zi5FeGFt",
-            "cGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person), global::Google.Protobuf.Examples.AddressBook.Person.Parser, new[]{ "Name", "Id", "Email", "Phones" }, null, new[]{ typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser, new[]{ "Number", "Type" }, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), global::Google.Protobuf.Examples.AddressBook.AddressBook.Parser, new[]{ "People" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  ///  [START messages]
-  /// </summary>
-  public sealed partial class Person : pb::IMessage<Person> {
-    private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<Person> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Examples.AddressBook.AddressbookReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Person() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Person(Person other) : this() {
-      name_ = other.name_;
-      id_ = other.id_;
-      email_ = other.email_;
-      phones_ = other.phones_.Clone();
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Person Clone() {
-      return new Person(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "id" field.</summary>
-    public const int IdFieldNumber = 2;
-    private int id_;
-    /// <summary>
-    ///  Unique ID number for this person.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int Id {
-      get { return id_; }
-      set {
-        id_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "email" field.</summary>
-    public const int EmailFieldNumber = 3;
-    private string email_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Email {
-      get { return email_; }
-      set {
-        email_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "phones" field.</summary>
-    public const int PhonesFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> _repeated_phones_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> phones_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> Phones {
-      get { return phones_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as Person);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(Person other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Id != other.Id) return false;
-      if (Email != other.Email) return false;
-      if(!phones_.Equals(other.phones_)) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Id != 0) hash ^= Id.GetHashCode();
-      if (Email.Length != 0) hash ^= Email.GetHashCode();
-      hash ^= phones_.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Id != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Id);
-      }
-      if (Email.Length != 0) {
-        output.WriteRawTag(26);
-        output.WriteString(Email);
-      }
-      phones_.WriteTo(output, _repeated_phones_codec);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Id != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Id);
-      }
-      if (Email.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Email);
-      }
-      size += phones_.CalculateSize(_repeated_phones_codec);
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(Person other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Id != 0) {
-        Id = other.Id;
-      }
-      if (other.Email.Length != 0) {
-        Email = other.Email;
-      }
-      phones_.Add(other.phones_);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Id = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            Email = input.ReadString();
-            break;
-          }
-          case 34: {
-            phones_.AddEntriesFrom(input, _repeated_phones_codec);
-            break;
-          }
-        }
-      }
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the Person message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static partial class Types {
-      public enum PhoneType {
-        [pbr::OriginalName("MOBILE")] Mobile = 0,
-        [pbr::OriginalName("HOME")] Home = 1,
-        [pbr::OriginalName("WORK")] Work = 2,
-      }
-
-      public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber> {
-        private static readonly pb::MessageParser<PhoneNumber> _parser = new pb::MessageParser<PhoneNumber>(() => new PhoneNumber());
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public static pb::MessageParser<PhoneNumber> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Examples.AddressBook.Person.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public PhoneNumber() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public PhoneNumber(PhoneNumber other) : this() {
-          number_ = other.number_;
-          type_ = other.type_;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public PhoneNumber Clone() {
-          return new PhoneNumber(this);
-        }
-
-        /// <summary>Field number for the "number" field.</summary>
-        public const int NumberFieldNumber = 1;
-        private string number_ = "";
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public string Number {
-          get { return number_; }
-          set {
-            number_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-
-        /// <summary>Field number for the "type" field.</summary>
-        public const int TypeFieldNumber = 2;
-        private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = 0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type {
-          get { return type_; }
-          set {
-            type_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public override bool Equals(object other) {
-          return Equals(other as PhoneNumber);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public bool Equals(PhoneNumber other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Number != other.Number) return false;
-          if (Type != other.Type) return false;
-          return true;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Number.Length != 0) hash ^= Number.GetHashCode();
-          if (Type != 0) hash ^= Type.GetHashCode();
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Number.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(Number);
-          }
-          if (Type != 0) {
-            output.WriteRawTag(16);
-            output.WriteEnum((int) Type);
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public int CalculateSize() {
-          int size = 0;
-          if (Number.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(Number);
-          }
-          if (Type != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public void MergeFrom(PhoneNumber other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Number.Length != 0) {
-            Number = other.Number;
-          }
-          if (other.Type != 0) {
-            Type = other.Type;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                input.SkipLastField();
-                break;
-              case 10: {
-                Number = input.ReadString();
-                break;
-              }
-              case 16: {
-                type_ = (global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) input.ReadEnum();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  ///  Our address book file is just one of these.
-  /// </summary>
-  public sealed partial class AddressBook : pb::IMessage<AddressBook> {
-    private static readonly pb::MessageParser<AddressBook> _parser = new pb::MessageParser<AddressBook>(() => new AddressBook());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<AddressBook> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Examples.AddressBook.AddressbookReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AddressBook() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AddressBook(AddressBook other) : this() {
-      people_ = other.people_.Clone();
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public AddressBook Clone() {
-      return new AddressBook(this);
-    }
-
-    /// <summary>Field number for the "people" field.</summary>
-    public const int PeopleFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person> _repeated_people_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Examples.AddressBook.Person.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> people_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> People {
-      get { return people_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as AddressBook);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(AddressBook other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!people_.Equals(other.people_)) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= people_.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      people_.WriteTo(output, _repeated_people_codec);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      size += people_.CalculateSize(_repeated_people_codec);
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(AddressBook other) {
-      if (other == null) {
-        return;
-      }
-      people_.Add(other.people_);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            people_.AddEntriesFrom(input, _repeated_people_codec);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/src/AddressBook/ListPeople.cs

@@ -1,99 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    internal class ListPeople
-    {
-        /// <summary>
-        /// Iterates though all people in the AddressBook and prints info about them.
-        /// </summary>
-        private static void Print(AddressBook addressBook)
-        {
-            foreach (Person person in addressBook.People)
-            {
-                Console.WriteLine("Person ID: {0}", person.Id);
-                Console.WriteLine("  Name: {0}", person.Name);
-                if (person.Email != "")
-                {
-                    Console.WriteLine("  E-mail address: {0}", person.Email);
-                }
-
-                foreach (Person.Types.PhoneNumber phoneNumber in person.Phones)
-                {
-                    switch (phoneNumber.Type)
-                    {
-                        case Person.Types.PhoneType.Mobile:
-                            Console.Write("  Mobile phone #: ");
-                            break;
-                        case Person.Types.PhoneType.Home:
-                            Console.Write("  Home phone #: ");
-                            break;
-                        case Person.Types.PhoneType.Work:
-                            Console.Write("  Work phone #: ");
-                            break;
-                    }
-                    Console.WriteLine(phoneNumber.Number);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Entry point - loads the addressbook and then displays it.
-        /// </summary>
-        public static int Main(string[] args)
-        {
-            if (args.Length != 1)
-            {
-                Console.Error.WriteLine("Usage:  ListPeople ADDRESS_BOOK_FILE");
-                return 1;
-            }
-
-            if (!File.Exists(args[0]))
-            {
-                Console.WriteLine("{0} doesn't exist. Add a person to create the file first.", args[0]);
-                return 0;
-            }
-
-            // Read the existing address book.
-            using (Stream stream = File.OpenRead(args[0]))
-            {
-                AddressBook addressBook = AddressBook.Parser.ParseFrom(stream);
-                Print(addressBook);
-            }
-            return 0;
-        }
-    }
-}

csharp/src/AddressBook/Program.cs

@@ -1,95 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    /// <summary>
-    /// Entry point. Repeatedly prompts user for an action to take, delegating actual behaviour
-    /// to individual actions. Each action has its own Main method, so that it can be used as an
-    /// invidual complete program.
-    /// </summary>
-    internal class Program
-    {
-        private static int Main(string[] args)
-        {
-            if (args.Length > 1)
-            {
-                Console.Error.WriteLine("Usage: AddressBook [file]");
-                Console.Error.WriteLine("If the filename isn't specified, \"addressbook.data\" is used instead.");
-                return 1;
-            }
-            string addressBookFile = args.Length > 0 ? args[0] : "addressbook.data";
-
-            bool stopping = false;
-            while (!stopping)
-            {
-                Console.WriteLine("Options:");
-                Console.WriteLine("  L: List contents");
-                Console.WriteLine("  A: Add new person");
-                Console.WriteLine("  Q: Quit");
-                Console.Write("Action? ");
-                Console.Out.Flush();
-                char choice = Console.ReadKey().KeyChar;
-                Console.WriteLine();
-                try
-                {
-                    switch (choice)
-                    {
-                        case 'A':
-                        case 'a':
-                            AddPerson.Main(new string[] {addressBookFile});
-                            break;
-                        case 'L':
-                        case 'l':
-                            ListPeople.Main(new string[] {addressBookFile});
-                            break;
-                        case 'Q':
-                        case 'q':
-                            stopping = true;
-                            break;
-                        default:
-                            Console.WriteLine("Unknown option: {0}", choice);
-                            break;
-                    }
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Exception executing action: {0}", e);
-                }
-                Console.WriteLine();
-            }
-            return 0;
-        }
-    }
-}

csharp/src/AddressBook/SampleUsage.cs

@@ -1,73 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    internal class SampleUsage
-    {
-        private static void Main()
-        {
-            byte[] bytes;
-            // Create a new person
-            Person person = new Person
-            {
-                Id = 1,
-                Name = "Foo",
-                Email = "foo@bar",
-                Phones = { new Person.Types.PhoneNumber { Number = "555-1212" } }
-            };
-            using (MemoryStream stream = new MemoryStream())
-            {
-                // Save the person to a stream
-                person.WriteTo(stream);
-                bytes = stream.ToArray();
-            }
-            Person copy = Person.Parser.ParseFrom(bytes);
-
-            AddressBook book = new AddressBook
-            {
-                People = { copy }
-            };
-            bytes = book.ToByteArray();
-            // And read the address book back again
-            AddressBook restored = AddressBook.Parser.ParseFrom(bytes);
-            // The message performs a deep-comparison on equality:
-            if (restored.People.Count != 1 || !person.Equals(restored.People[0]))
-            {
-                throw new Exception("There is a bad person in here!");
-            }
-        }
-    }
-}

csharp/src/AddressBook/project.json

@@ -1,20 +0,0 @@
-{
-  "buildOptions": {
-    "debugType": "portable",
-    "emitEntryPoint": true,
-    "additionalArguments": [ "/main:Google.Protobuf.Examples.AddressBook.Program" ]
-  },
-  "dependencies": {
-    "Google.Protobuf": { "target": "project" }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0"
-        }
-      }
-    }
-  }
-}

csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.xproj

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>dddc055b-e185-4181-bab0-072f0f984569</ProjectGuid>
-    <RootNamespace>Google.Protobuf.Conformance</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/src/Google.Protobuf.Conformance/Program.cs

@@ -1,142 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Conformance;
-using Google.Protobuf.Reflection;
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Conformance
-{
-    /// <summary>
-    /// Conformance tests. The test runner will provide JSON or proto data on stdin,
-    /// and this program will produce its output on stdout.
-    /// </summary>
-    class Program
-    {
-        private static void Main(string[] args)
-        {
-            // This way we get the binary streams instead of readers/writers.
-            var input = new BinaryReader(Console.OpenStandardInput());
-            var output = new BinaryWriter(Console.OpenStandardOutput());
-            var typeRegistry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-
-            int count = 0;
-            while (RunTest(input, output, typeRegistry))
-            {
-                count++;
-            }
-            Console.Error.WriteLine("Received EOF after {0} tests", count);
-        }
-
-        private static bool RunTest(BinaryReader input, BinaryWriter output, TypeRegistry typeRegistry)
-        {
-            int? size = ReadInt32(input);
-            if (size == null)
-            {
-                return false;
-            }
-            byte[] inputData = input.ReadBytes(size.Value);
-            if (inputData.Length != size.Value)
-            {
-                throw new EndOfStreamException("Read " + inputData.Length + " bytes of data when expecting " + size);
-            }
-            ConformanceRequest request = ConformanceRequest.Parser.ParseFrom(inputData);
-            ConformanceResponse response = PerformRequest(request, typeRegistry);
-            byte[] outputData = response.ToByteArray();
-            output.Write(outputData.Length);
-            output.Write(outputData);
-            // Ready for another test...
-            return true;
-        }
-
-        private static ConformanceResponse PerformRequest(ConformanceRequest request, TypeRegistry typeRegistry)
-        {
-            TestAllTypes message;
-            try
-            {
-                switch (request.PayloadCase)
-                {
-                    case ConformanceRequest.PayloadOneofCase.JsonPayload:
-                        var parser = new JsonParser(new JsonParser.Settings(20, typeRegistry));
-                        message = parser.Parse<TestAllTypes>(request.JsonPayload);
-                        break;
-                    case ConformanceRequest.PayloadOneofCase.ProtobufPayload:
-                        message = TestAllTypes.Parser.ParseFrom(request.ProtobufPayload);
-                        break;
-                    default:
-                        throw new Exception("Unsupported request payload: " + request.PayloadCase);
-                }
-            }
-            catch (InvalidProtocolBufferException e)
-            {
-                return new ConformanceResponse { ParseError = e.Message };
-            }
-            catch (InvalidJsonException e)
-            {
-                return new ConformanceResponse { ParseError = e.Message };
-            }
-            try
-            {
-                switch (request.RequestedOutputFormat)
-                {
-                    case global::Conformance.WireFormat.Json:
-                        var formatter = new JsonFormatter(new JsonFormatter.Settings(false, typeRegistry));
-                        return new ConformanceResponse { JsonPayload = formatter.Format(message) };
-                    case global::Conformance.WireFormat.Protobuf:
-                        return new ConformanceResponse { ProtobufPayload = message.ToByteString() };
-                    default:
-                        throw new Exception("Unsupported request output format: " + request.PayloadCase);
-                }
-            }
-            catch (InvalidOperationException e)
-            {
-                return new ConformanceResponse { SerializeError = e.Message };
-            }
-        }
-
-        private static int? ReadInt32(BinaryReader input)
-        {
-            byte[] bytes = input.ReadBytes(4);
-            if (bytes.Length == 0)
-            {
-                // Cleanly reached the end of the stream
-                return null;
-            }
-            if (bytes.Length != 4)
-            {
-                throw new EndOfStreamException("Read " + bytes.Length + " bytes of size when expecting 4");
-            }
-            return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
-        }
-    }
-}

csharp/src/Google.Protobuf.Conformance/project.json

@@ -1,19 +0,0 @@
-{
-  "buildOptions": {
-    "debugType": "portable",
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "Google.Protobuf": { "target": "project" }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0"
-        }
-      }
-    }
-  }
-}

csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.xproj

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>9695e08f-9829-497d-b95c-b38f28d48690</ProjectGuid>
-    <RootNamespace>Google.Protobuf.JsonDump</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/src/Google.Protobuf.JsonDump/Program.cs

@@ -1,73 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using System.Reflection;
-
-namespace Google.Protobuf.ProtoDump
-{
-    /// <summary>
-    /// Small utility to load a binary message and dump it in JSON format.
-    /// </summary>
-    internal class Program
-    {
-        private static int Main(string[] args)
-        {
-            if (args.Length != 2)
-            {
-                Console.Error.WriteLine("Usage: Google.Protobuf.JsonDump <descriptor type name> <input data>");
-                Console.Error.WriteLine("The descriptor type name is the fully-qualified message name,");
-                Console.Error.WriteLine("including assembly e.g. ProjectNamespace.Message,Company.Project");
-                return 1;
-            }
-            Type type = Type.GetType(args[0]);
-            if (type == null)
-            {
-                Console.Error.WriteLine("Unable to load type {0}.", args[0]);
-                return 1;
-            }
-            if (!typeof(IMessage).GetTypeInfo().IsAssignableFrom(type))
-            {
-                Console.Error.WriteLine("Type {0} doesn't implement IMessage.", args[0]);
-                return 1;
-            }
-            IMessage message = (IMessage) Activator.CreateInstance(type);
-            using (var input = File.OpenRead(args[1]))
-            {
-                message.MergeFrom(input);
-            }
-            Console.WriteLine(message);
-            return 0;
-        }
-    }
-}

csharp/src/Google.Protobuf.JsonDump/project.json

@@ -1,19 +0,0 @@
-{
-  "buildOptions": {
-    "debugType": "portable",
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "Google.Protobuf": { "target": "project" }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0"
-        }
-      }
-    }
-  }
-}

csharp/src/Google.Protobuf.Test/ByteStringTest.cs

@@ -1,171 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Text;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class ByteStringTest
-    {
-        [Test]
-        public void Equality()
-        {
-            ByteString b1 = ByteString.CopyFrom(1, 2, 3);
-            ByteString b2 = ByteString.CopyFrom(1, 2, 3);
-            ByteString b3 = ByteString.CopyFrom(1, 2, 4);
-            ByteString b4 = ByteString.CopyFrom(1, 2, 3, 4);
-            EqualityTester.AssertEquality(b1, b1);
-            EqualityTester.AssertEquality(b1, b2);
-            EqualityTester.AssertInequality(b1, b3);
-            EqualityTester.AssertInequality(b1, b4);
-            EqualityTester.AssertInequality(b1, null);
-#pragma warning disable 1718 // Deliberately calling ==(b1, b1) and !=(b1, b1)
-            Assert.IsTrue(b1 == b1);
-            Assert.IsTrue(b1 == b2);
-            Assert.IsFalse(b1 == b3);
-            Assert.IsFalse(b1 == b4);
-            Assert.IsFalse(b1 == null);
-            Assert.IsTrue((ByteString) null == null);
-            Assert.IsFalse(b1 != b1);
-            Assert.IsFalse(b1 != b2);
-#pragma warning disable 1718
-            Assert.IsTrue(b1 != b3);
-            Assert.IsTrue(b1 != b4);
-            Assert.IsTrue(b1 != null);
-            Assert.IsFalse((ByteString) null != null);
-        }
-
-        [Test]
-        public void EmptyByteStringHasZeroSize()
-        {
-            Assert.AreEqual(0, ByteString.Empty.Length);
-        }
-
-        [Test]
-        public void CopyFromStringWithExplicitEncoding()
-        {
-            ByteString bs = ByteString.CopyFrom("AB", Encoding.Unicode);
-            Assert.AreEqual(4, bs.Length);
-            Assert.AreEqual(65, bs[0]);
-            Assert.AreEqual(0, bs[1]);
-            Assert.AreEqual(66, bs[2]);
-            Assert.AreEqual(0, bs[3]);
-        }
-
-        [Test]
-        public void IsEmptyWhenEmpty()
-        {
-            Assert.IsTrue(ByteString.CopyFromUtf8("").IsEmpty);
-        }
-
-        [Test]
-        public void IsEmptyWhenNotEmpty()
-        {
-            Assert.IsFalse(ByteString.CopyFromUtf8("X").IsEmpty);
-        }
-
-        [Test]
-        public void CopyFromByteArrayCopiesContents()
-        {
-            byte[] data = new byte[1];
-            data[0] = 10;
-            ByteString bs = ByteString.CopyFrom(data);
-            Assert.AreEqual(10, bs[0]);
-            data[0] = 5;
-            Assert.AreEqual(10, bs[0]);
-        }
-
-        [Test]
-        public void ToByteArrayCopiesContents()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("Hello");
-            byte[] data = bs.ToByteArray();
-            Assert.AreEqual((byte)'H', data[0]);
-            Assert.AreEqual((byte)'H', bs[0]);
-            data[0] = 0;
-            Assert.AreEqual(0, data[0]);
-            Assert.AreEqual((byte)'H', bs[0]);
-        }
-
-        [Test]
-        public void CopyFromUtf8UsesUtf8()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");
-            Assert.AreEqual(3, bs.Length);
-            Assert.AreEqual(0xe2, bs[0]);
-            Assert.AreEqual(0x82, bs[1]);
-            Assert.AreEqual(0xac, bs[2]);
-        }
-
-        [Test]
-        public void CopyFromPortion()
-        {
-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};
-            ByteString bs = ByteString.CopyFrom(data, 2, 3);
-            Assert.AreEqual(3, bs.Length);
-            Assert.AreEqual(2, bs[0]);
-            Assert.AreEqual(3, bs[1]);
-        }
-
-        [Test]
-        public void ToStringUtf8()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");
-            Assert.AreEqual("\u20ac", bs.ToStringUtf8());
-        }
-
-        [Test]
-        public void ToStringWithExplicitEncoding()
-        {
-            ByteString bs = ByteString.CopyFrom("\u20ac", Encoding.Unicode);
-            Assert.AreEqual("\u20ac", bs.ToString(Encoding.Unicode));
-        }
-
-        [Test]
-        public void FromBase64_WithText()
-        {
-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};
-            string base64 = Convert.ToBase64String(data);
-            ByteString bs = ByteString.FromBase64(base64);
-            Assert.AreEqual(data, bs.ToByteArray());
-        }
-
-        [Test]
-        public void FromBase64_Empty()
-        {
-            // Optimization which also fixes issue 61.
-            Assert.AreSame(ByteString.Empty, ByteString.FromBase64(""));
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs

@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    internal static class CodedInputStreamExtensions
-    {
-        public static void AssertNextTag(this CodedInputStream input, uint expectedTag)
-        {
-            uint tag = input.ReadTag();
-            Assert.AreEqual(expectedTag, tag);
-        }
-
-        public static T ReadMessage<T>(this CodedInputStream stream, MessageParser<T> parser)
-            where T : IMessage<T>
-        {
-            var message = parser.CreateTemplate();
-            stream.ReadMessage(message);
-            return message;
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs

@@ -1,598 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class CodedInputStreamTest
-    {
-        /// <summary>
-        /// Helper to construct a byte array from a bunch of bytes.  The inputs are
-        /// actually ints so that I can use hex notation and not get stupid errors
-        /// about precision.
-        /// </summary>
-        private static byte[] Bytes(params int[] bytesAsInts)
-        {
-            byte[] bytes = new byte[bytesAsInts.Length];
-            for (int i = 0; i < bytesAsInts.Length; i++)
-            {
-                bytes[i] = (byte) bytesAsInts[i];
-            }
-            return bytes;
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64()
-        /// </summary>
-        private static void AssertReadVarint(byte[] data, ulong value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual((uint) value, input.ReadRawVarint32());
-
-            input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawVarint64());
-            Assert.IsTrue(input.IsAtEnd);
-
-            // Try different block sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                input = new CodedInputStream(new SmallBlockInputStream(data, bufferSize));
-                Assert.AreEqual((uint) value, input.ReadRawVarint32());
-
-                input = new CodedInputStream(new SmallBlockInputStream(data, bufferSize));
-                Assert.AreEqual(value, input.ReadRawVarint64());
-                Assert.IsTrue(input.IsAtEnd);
-            }
-
-            // Try reading directly from a MemoryStream. We want to verify that it
-            // doesn't read past the end of the input, so write an extra byte - this
-            // lets us test the position at the end.
-            MemoryStream memoryStream = new MemoryStream();
-            memoryStream.Write(data, 0, data.Length);
-            memoryStream.WriteByte(0);
-            memoryStream.Position = 0;
-            Assert.AreEqual((uint) value, CodedInputStream.ReadRawVarint32(memoryStream));
-            Assert.AreEqual(data.Length, memoryStream.Position);
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64() and
-        /// expects them to fail with an InvalidProtocolBufferException whose
-        /// description matches the given one.
-        /// </summary>
-        private static void AssertReadVarintFailure(InvalidProtocolBufferException expected, byte[] data)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            var exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint32());
-            Assert.AreEqual(expected.Message, exception.Message);
-
-            input = new CodedInputStream(data);
-            exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint64());
-            Assert.AreEqual(expected.Message, exception.Message);
-
-            // Make sure we get the same error when reading directly from a Stream.
-            exception = Assert.Throws<InvalidProtocolBufferException>(() => CodedInputStream.ReadRawVarint32(new MemoryStream(data)));
-            Assert.AreEqual(expected.Message, exception.Message);
-        }
-
-        [Test]
-        public void ReadVarint()
-        {
-            AssertReadVarint(Bytes(0x00), 0);
-            AssertReadVarint(Bytes(0x01), 1);
-            AssertReadVarint(Bytes(0x7f), 127);
-            // 14882
-            AssertReadVarint(Bytes(0xa2, 0x74), (0x22 << 0) | (0x74 << 7));
-            // 2961488830
-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b),
-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                             (0x0bL << 28));
-
-            // 64-bit
-            // 7256456126
-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b),
-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                             (0x1bL << 28));
-            // 41256202580718336
-            AssertReadVarint(Bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49),
-                             (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-                             (0x43L << 28) | (0x49L << 35) | (0x24L << 42) | (0x49L << 49));
-            // 11964378330978735131
-            AssertReadVarint(Bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01),
-                             (0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                             (0x3bUL << 28) | (0x56UL << 35) | (0x00UL << 42) |
-                             (0x05UL << 49) | (0x26UL << 56) | (0x01UL << 63));
-
-            // Failures
-            AssertReadVarintFailure(
-                InvalidProtocolBufferException.MalformedVarint(),
-                Bytes(0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-                      0x00));
-            AssertReadVarintFailure(
-                InvalidProtocolBufferException.TruncatedMessage(),
-                Bytes(0x80));
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawLittleEndian32() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertReadLittleEndian32(byte[] data, uint value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawLittleEndian32());
-            Assert.IsTrue(input.IsAtEnd);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                input = new CodedInputStream(
-                    new SmallBlockInputStream(data, blockSize));
-                Assert.AreEqual(value, input.ReadRawLittleEndian32());
-                Assert.IsTrue(input.IsAtEnd);
-            }
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawLittleEndian64() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertReadLittleEndian64(byte[] data, ulong value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawLittleEndian64());
-            Assert.IsTrue(input.IsAtEnd);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                input = new CodedInputStream(
-                    new SmallBlockInputStream(data, blockSize));
-                Assert.AreEqual(value, input.ReadRawLittleEndian64());
-                Assert.IsTrue(input.IsAtEnd);
-            }
-        }
-
-        [Test]
-        public void ReadLittleEndian()
-        {
-            AssertReadLittleEndian32(Bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);
-            AssertReadLittleEndian32(Bytes(0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef0);
-
-            AssertReadLittleEndian64(Bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12),
-                                     0x123456789abcdef0L);
-            AssertReadLittleEndian64(
-                Bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678UL);
-        }
-
-        [Test]
-        public void DecodeZigZag32()
-        {
-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(0));
-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag32(1));
-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag32(2));
-            Assert.AreEqual(-2, CodedInputStream.DecodeZigZag32(3));
-            Assert.AreEqual(0x3FFFFFFF, CodedInputStream.DecodeZigZag32(0x7FFFFFFE));
-            Assert.AreEqual(unchecked((int) 0xC0000000), CodedInputStream.DecodeZigZag32(0x7FFFFFFF));
-            Assert.AreEqual(0x7FFFFFFF, CodedInputStream.DecodeZigZag32(0xFFFFFFFE));
-            Assert.AreEqual(unchecked((int) 0x80000000), CodedInputStream.DecodeZigZag32(0xFFFFFFFF));
-        }
-
-        [Test]
-        public void DecodeZigZag64()
-        {
-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(0));
-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag64(1));
-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag64(2));
-            Assert.AreEqual(-2, CodedInputStream.DecodeZigZag64(3));
-            Assert.AreEqual(0x000000003FFFFFFFL, CodedInputStream.DecodeZigZag64(0x000000007FFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0xFFFFFFFFC0000000L), CodedInputStream.DecodeZigZag64(0x000000007FFFFFFFL));
-            Assert.AreEqual(0x000000007FFFFFFFL, CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0xFFFFFFFF80000000L), CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFFL));
-            Assert.AreEqual(0x7FFFFFFFFFFFFFFFL, CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0x8000000000000000L), CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL));
-        }
-        
-        [Test]
-        public void ReadWholeMessage_VaryingBlockSizes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-            Assert.AreEqual(rawBytes.Length, message.CalculateSize());
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(rawBytes);
-            Assert.AreEqual(message, message2);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                message2 = TestAllTypes.Parser.ParseFrom(new SmallBlockInputStream(rawBytes, blockSize));
-                Assert.AreEqual(message, message2);
-            }
-        }
-                
-        [Test]
-        public void ReadHugeBlob()
-        {
-            // Allocate and initialize a 1MB blob.
-            byte[] blob = new byte[1 << 20];
-            for (int i = 0; i < blob.Length; i++)
-            {
-                blob[i] = (byte) i;
-            }
-
-            // Make a message containing it.
-            var message = new TestAllTypes { SingleBytes = ByteString.CopyFrom(blob) };
-
-            // Serialize and parse it.  Make sure to parse from an InputStream, not
-            // directly from a ByteString, so that CodedInputStream uses buffered
-            // reading.
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(message.ToByteString());
-
-            Assert.AreEqual(message, message2);
-        }
-
-        [Test]
-        public void ReadMaliciouslyLargeBlob()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(0x7FFFFFFF);
-            output.WriteRawBytes(new byte[32]); // Pad with a few random bytes.
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-            Assert.AreEqual(tag, input.ReadTag());
-
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadBytes());
-        }
-
-        internal static TestRecursiveMessage MakeRecursiveMessage(int depth)
-        {
-            if (depth == 0)
-            {
-                return new TestRecursiveMessage { I = 5 };
-            }
-            else
-            {
-                return new TestRecursiveMessage { A = MakeRecursiveMessage(depth - 1) };
-            }
-        }
-
-        internal static void AssertMessageDepth(TestRecursiveMessage message, int depth)
-        {
-            if (depth == 0)
-            {
-                Assert.IsNull(message.A);
-                Assert.AreEqual(5, message.I);
-            }
-            else
-            {
-                Assert.IsNotNull(message.A);
-                AssertMessageDepth(message.A, depth - 1);
-            }
-        }
-
-        [Test]
-        public void MaliciousRecursion()
-        {
-            ByteString data64 = MakeRecursiveMessage(64).ToByteString();
-            ByteString data65 = MakeRecursiveMessage(65).ToByteString();
-
-            AssertMessageDepth(TestRecursiveMessage.Parser.ParseFrom(data64), 64);
-
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(data65));
-
-            CodedInputStream input = CodedInputStream.CreateWithLimits(new MemoryStream(data64.ToByteArray()), 1000000, 63);
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(input));
-        }
-
-        [Test]
-        public void SizeLimit()
-        {
-            // Have to use a Stream rather than ByteString.CreateCodedInput as SizeLimit doesn't
-            // apply to the latter case.
-            MemoryStream ms = new MemoryStream(SampleMessages.CreateFullTestAllTypes().ToByteArray());
-            CodedInputStream input = CodedInputStream.CreateWithLimits(ms, 16, 100);
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(input));
-        }
-
-        /// <summary>
-        /// Tests that if we read an string that contains invalid UTF-8, no exception
-        /// is thrown.  Instead, the invalid bytes are replaced with the Unicode
-        /// "replacement character" U+FFFD.
-        /// </summary>
-        [Test]
-        public void ReadInvalidUtf8()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(1);
-            output.WriteRawBytes(new byte[] {0x80});
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-
-            Assert.AreEqual(tag, input.ReadTag());
-            string text = input.ReadString();
-            Assert.AreEqual('\ufffd', text[0]);
-        }
-
-        /// <summary>
-        /// A stream which limits the number of bytes it reads at a time.
-        /// We use this to make sure that CodedInputStream doesn't screw up when
-        /// reading in small blocks.
-        /// </summary>
-        private sealed class SmallBlockInputStream : MemoryStream
-        {
-            private readonly int blockSize;
-
-            public SmallBlockInputStream(byte[] data, int blockSize)
-                : base(data)
-            {
-                this.blockSize = blockSize;
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return base.Read(buffer, offset, Math.Min(count, blockSize));
-            }
-        }
-
-        [Test]
-        public void TestNegativeEnum()
-        {
-            byte[] bytes = { 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01 };
-            CodedInputStream input = new CodedInputStream(bytes);
-            Assert.AreEqual((int)SampleEnum.NegativeValue, input.ReadEnum());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        //Issue 71:	CodedInputStream.ReadBytes go to slow path unnecessarily
-        [Test]
-        public void TestSlowPathAvoidance()
-        {
-            using (var ms = new MemoryStream())
-            {
-                CodedOutputStream output = new CodedOutputStream(ms);
-                output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));
-                output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));
-                output.Flush();
-
-                ms.Position = 0;
-                CodedInputStream input = new CodedInputStream(ms, new byte[ms.Length / 2], 0, 0);
-
-                uint tag = input.ReadTag();
-                Assert.AreEqual(1, WireFormat.GetTagFieldNumber(tag));
-                Assert.AreEqual(100, input.ReadBytes().Length);
-
-                tag = input.ReadTag();
-                Assert.AreEqual(2, WireFormat.GetTagFieldNumber(tag));
-                Assert.AreEqual(100, input.ReadBytes().Length);
-            }
-        }
-
-        [Test]
-        public void Tag0Throws()
-        {
-            var input = new CodedInputStream(new byte[] { 0 });
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadTag());
-        }
-
-        [Test]
-        public void SkipGroup()
-        {
-            // Create an output stream with a group in:
-            // Field 1: string "field 1"
-            // Field 2: group containing:
-            //   Field 1: fixed int32 value 100
-            //   Field 2: string "ignore me"
-            //   Field 3: nested group containing
-            //      Field 1: fixed int64 value 1000
-            // Field 3: string "field 3"
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 1");
-            
-            // The outer group...
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(1, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(100);
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteString("ignore me");
-            // The nested group...
-            output.WriteTag(3, WireFormat.WireType.StartGroup);
-            output.WriteTag(1, WireFormat.WireType.Fixed64);
-            output.WriteFixed64(1000);
-            // Note: Not sure the field number is relevant for end group...
-            output.WriteTag(3, WireFormat.WireType.EndGroup);
-
-            // End the outer group
-            output.WriteTag(2, WireFormat.WireType.EndGroup);
-
-            output.WriteTag(3, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 3");
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 1", input.ReadString());
-            Assert.AreEqual(WireFormat.MakeTag(2, WireFormat.WireType.StartGroup), input.ReadTag());
-            input.SkipLastField(); // Should consume the whole group, including the nested one.
-            Assert.AreEqual(WireFormat.MakeTag(3, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 3", input.ReadString());
-        }
-
-        [Test]
-        public void SkipGroup_WrongEndGroupTag()
-        {
-            // Create an output stream with:
-            // Field 1: string "field 1"
-            // Start group 2
-            //   Field 3: fixed int32
-            // End group 4 (should give an error)
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 1");
-
-            // The outer group...
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(3, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(100);
-            output.WriteTag(4, WireFormat.WireType.EndGroup);
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 1", input.ReadString());
-            Assert.AreEqual(WireFormat.MakeTag(2, WireFormat.WireType.StartGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void RogueEndGroupTag()
-        {
-            // If we have an end-group tag without a leading start-group tag, generated
-            // code will just call SkipLastField... so that should fail.
-
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.EndGroup);
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.EndGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void EndOfStreamReachedWhileSkippingGroup()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.StartGroup);
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(2, WireFormat.WireType.EndGroup);
-
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            input.ReadTag();
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void RecursionLimitAppliedWhileSkippingGroup()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            for (int i = 0; i < CodedInputStream.DefaultRecursionLimit + 1; i++)
-            {
-                output.WriteTag(1, WireFormat.WireType.StartGroup);
-            }
-            for (int i = 0; i < CodedInputStream.DefaultRecursionLimit + 1; i++)
-            {
-                output.WriteTag(1, WireFormat.WireType.EndGroup);
-            }
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.StartGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void Construction_Invalid()
-        {
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream((byte[]) null));
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream(null, 0, 0));
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream((Stream) null));
-            Assert.Throws<ArgumentOutOfRangeException>(() => new CodedInputStream(new byte[10], 100, 0));
-            Assert.Throws<ArgumentOutOfRangeException>(() => new CodedInputStream(new byte[10], 5, 10));
-        }
-
-        [Test]
-        public void CreateWithLimits_InvalidLimits()
-        {
-            var stream = new MemoryStream();
-            Assert.Throws<ArgumentOutOfRangeException>(() => CodedInputStream.CreateWithLimits(stream, 0, 1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => CodedInputStream.CreateWithLimits(stream, 1, 0));
-        }
-
-        [Test]
-        public void Dispose_DisposesUnderlyingStream()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanRead);
-            using (var cis = new CodedInputStream(memoryStream))
-            {
-            }
-            Assert.IsFalse(memoryStream.CanRead); // Disposed
-        }
-
-        [Test]
-        public void Dispose_WithLeaveOpen()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanRead);
-            using (var cis = new CodedInputStream(memoryStream, true))
-            {
-            }
-            Assert.IsTrue(memoryStream.CanRead); // We left the stream open
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs

@@ -1,419 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class CodedOutputStreamTest
-    {
-        /// <summary>
-        /// Writes the given value using WriteRawVarint32() and WriteRawVarint64() and
-        /// checks that the result matches the given bytes
-        /// </summary>
-        private static void AssertWriteVarint(byte[] data, ulong value)
-        {
-            // Only do 32-bit write if the value fits in 32 bits.
-            if ((value >> 32) == 0)
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput);
-                output.WriteRawVarint32((uint) value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-                // Also try computing size.
-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint32Size((uint) value));
-            }
-
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput);
-                output.WriteRawVarint64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                // Also try computing size.
-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint64Size(value));
-            }
-
-            // Try different buffer sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                // Only do 32-bit write if the value fits in 32 bits.
-                if ((value >> 32) == 0)
-                {
-                    MemoryStream rawOutput = new MemoryStream();
-                    CodedOutputStream output =
-                        new CodedOutputStream(rawOutput, bufferSize);
-                    output.WriteRawVarint32((uint) value);
-                    output.Flush();
-                    Assert.AreEqual(data, rawOutput.ToArray());
-                }
-
-                {
-                    MemoryStream rawOutput = new MemoryStream();
-                    CodedOutputStream output = new CodedOutputStream(rawOutput, bufferSize);
-                    output.WriteRawVarint64(value);
-                    output.Flush();
-                    Assert.AreEqual(data, rawOutput.ToArray());
-                }
-            }
-        }
-
-        /// <summary>
-        /// Tests WriteRawVarint32() and WriteRawVarint64()
-        /// </summary>
-        [Test]
-        public void WriteVarint()
-        {
-            AssertWriteVarint(new byte[] {0x00}, 0);
-            AssertWriteVarint(new byte[] {0x01}, 1);
-            AssertWriteVarint(new byte[] {0x7f}, 127);
-            // 14882
-            AssertWriteVarint(new byte[] {0xa2, 0x74}, (0x22 << 0) | (0x74 << 7));
-            // 2961488830
-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x0b},
-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                              (0x0bL << 28));
-
-            // 64-bit
-            // 7256456126
-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x1b},
-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                              (0x1bL << 28));
-            // 41256202580718336
-            AssertWriteVarint(
-                new byte[] {0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49},
-                (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-                (0x43UL << 28) | (0x49L << 35) | (0x24UL << 42) | (0x49UL << 49));
-            // 11964378330978735131
-            AssertWriteVarint(
-                new byte[] {0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01},
-                unchecked((ulong)
-                          ((0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                           (0x3bL << 28) | (0x56L << 35) | (0x00L << 42) |
-                           (0x05L << 49) | (0x26L << 56) | (0x01L << 63))));
-        }
-
-        /// <summary>
-        /// Parses the given bytes using WriteRawLittleEndian32() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertWriteLittleEndian32(byte[] data, uint value)
-        {
-            MemoryStream rawOutput = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(rawOutput);
-            output.WriteRawLittleEndian32(value);
-            output.Flush();
-            Assert.AreEqual(data, rawOutput.ToArray());
-
-            // Try different buffer sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                rawOutput = new MemoryStream();
-                output = new CodedOutputStream(rawOutput, bufferSize);
-                output.WriteRawLittleEndian32(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Parses the given bytes using WriteRawLittleEndian64() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertWriteLittleEndian64(byte[] data, ulong value)
-        {
-            MemoryStream rawOutput = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(rawOutput);
-            output.WriteRawLittleEndian64(value);
-            output.Flush();
-            Assert.AreEqual(data, rawOutput.ToArray());
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                rawOutput = new MemoryStream();
-                output = new CodedOutputStream(rawOutput, blockSize);
-                output.WriteRawLittleEndian64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Tests writeRawLittleEndian32() and writeRawLittleEndian64().
-        /// </summary>
-        [Test]
-        public void WriteLittleEndian()
-        {
-            AssertWriteLittleEndian32(new byte[] {0x78, 0x56, 0x34, 0x12}, 0x12345678);
-            AssertWriteLittleEndian32(new byte[] {0xf0, 0xde, 0xbc, 0x9a}, 0x9abcdef0);
-
-            AssertWriteLittleEndian64(
-                new byte[] {0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12},
-                0x123456789abcdef0L);
-            AssertWriteLittleEndian64(
-                new byte[] {0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a},
-                0x9abcdef012345678UL);
-        }
-
-        [Test]
-        public void WriteWholeMessage_VaryingBlockSizes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput, blockSize);
-                message.WriteTo(output);
-                output.Flush();
-                Assert.AreEqual(rawBytes, rawOutput.ToArray());
-            }
-        }
-        
-        [Test]
-        public void EncodeZigZag32()
-        {
-            Assert.AreEqual(0u, CodedOutputStream.EncodeZigZag32(0));
-            Assert.AreEqual(1u, CodedOutputStream.EncodeZigZag32(-1));
-            Assert.AreEqual(2u, CodedOutputStream.EncodeZigZag32(1));
-            Assert.AreEqual(3u, CodedOutputStream.EncodeZigZag32(-2));
-            Assert.AreEqual(0x7FFFFFFEu, CodedOutputStream.EncodeZigZag32(0x3FFFFFFF));
-            Assert.AreEqual(0x7FFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0xC0000000)));
-            Assert.AreEqual(0xFFFFFFFEu, CodedOutputStream.EncodeZigZag32(0x7FFFFFFF));
-            Assert.AreEqual(0xFFFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0x80000000)));
-        }
-
-        [Test]
-        public void EncodeZigZag64()
-        {
-            Assert.AreEqual(0u, CodedOutputStream.EncodeZigZag64(0));
-            Assert.AreEqual(1u, CodedOutputStream.EncodeZigZag64(-1));
-            Assert.AreEqual(2u, CodedOutputStream.EncodeZigZag64(1));
-            Assert.AreEqual(3u, CodedOutputStream.EncodeZigZag64(-2));
-            Assert.AreEqual(0x000000007FFFFFFEuL,
-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x000000003FFFFFFFUL)));
-            Assert.AreEqual(0x000000007FFFFFFFuL,
-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0xFFFFFFFFC0000000UL)));
-            Assert.AreEqual(0x00000000FFFFFFFEuL,
-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x000000007FFFFFFFUL)));
-            Assert.AreEqual(0x00000000FFFFFFFFuL,
-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0xFFFFFFFF80000000UL)));
-            Assert.AreEqual(0xFFFFFFFFFFFFFFFEL,
-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x7FFFFFFFFFFFFFFFUL)));
-            Assert.AreEqual(0xFFFFFFFFFFFFFFFFL,
-                            CodedOutputStream.EncodeZigZag64(unchecked((long) 0x8000000000000000UL)));
-        }
-
-        [Test]
-        public void RoundTripZigZag32()
-        {
-            // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)
-            // were chosen semi-randomly via keyboard bashing.
-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(0)));
-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(1)));
-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-1)));
-            Assert.AreEqual(14927, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(14927)));
-            Assert.AreEqual(-3612, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-3612)));
-        }
-
-        [Test]
-        public void RoundTripZigZag64()
-        {
-            Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(0)));
-            Assert.AreEqual(1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(1)));
-            Assert.AreEqual(-1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-1)));
-            Assert.AreEqual(14927, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(14927)));
-            Assert.AreEqual(-3612, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-3612)));
-
-            Assert.AreEqual(856912304801416L,
-                            CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(856912304801416L)));
-            Assert.AreEqual(-75123905439571256L,
-                            CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-75123905439571256L)));
-        }
-
-        [Test]
-        public void TestNegativeEnumNoTag()
-        {
-            Assert.AreEqual(10, CodedOutputStream.ComputeInt32Size(-2));
-            Assert.AreEqual(10, CodedOutputStream.ComputeEnumSize((int) SampleEnum.NegativeValue));
-
-            byte[] bytes = new byte[10];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            output.WriteEnum((int) SampleEnum.NegativeValue);
-
-            Assert.AreEqual(0, output.SpaceLeft);
-            Assert.AreEqual("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes));
-        }
-
-        [Test]
-        public void TestCodedInputOutputPosition()
-        {
-            byte[] content = new byte[110];
-            for (int i = 0; i < content.Length; i++)
-                content[i] = (byte)i;
-
-            byte[] child = new byte[120];
-            {
-                MemoryStream ms = new MemoryStream(child);
-                CodedOutputStream cout = new CodedOutputStream(ms, 20);
-                // Field 11: numeric value: 500
-                cout.WriteTag(11, WireFormat.WireType.Varint);
-                Assert.AreEqual(1, cout.Position);
-                cout.WriteInt32(500);
-                Assert.AreEqual(3, cout.Position);
-                //Field 12: length delimited 120 bytes
-                cout.WriteTag(12, WireFormat.WireType.LengthDelimited);
-                Assert.AreEqual(4, cout.Position);
-                cout.WriteBytes(ByteString.CopyFrom(content));
-                Assert.AreEqual(115, cout.Position);
-                // Field 13: fixed numeric value: 501
-                cout.WriteTag(13, WireFormat.WireType.Fixed32);
-                Assert.AreEqual(116, cout.Position);
-                cout.WriteSFixed32(501);
-                Assert.AreEqual(120, cout.Position);
-                cout.Flush();
-            }
-
-            byte[] bytes = new byte[130];
-            {
-                CodedOutputStream cout = new CodedOutputStream(bytes);
-                // Field 1: numeric value: 500
-                cout.WriteTag(1, WireFormat.WireType.Varint);
-                Assert.AreEqual(1, cout.Position);
-                cout.WriteInt32(500);
-                Assert.AreEqual(3, cout.Position);
-                //Field 2: length delimited 120 bytes
-                cout.WriteTag(2, WireFormat.WireType.LengthDelimited);
-                Assert.AreEqual(4, cout.Position);
-                cout.WriteBytes(ByteString.CopyFrom(child));
-                Assert.AreEqual(125, cout.Position);
-                // Field 3: fixed numeric value: 500
-                cout.WriteTag(3, WireFormat.WireType.Fixed32);
-                Assert.AreEqual(126, cout.Position);
-                cout.WriteSFixed32(501);
-                Assert.AreEqual(130, cout.Position);
-                cout.Flush();
-            }
-            // Now test Input stream:
-            {
-                CodedInputStream cin = new CodedInputStream(new MemoryStream(bytes), new byte[50], 0, 0);
-                Assert.AreEqual(0, cin.Position);
-                // Field 1:
-                uint tag = cin.ReadTag();
-                Assert.AreEqual(1, tag >> 3);
-                Assert.AreEqual(1, cin.Position);
-                Assert.AreEqual(500, cin.ReadInt32());
-                Assert.AreEqual(3, cin.Position);
-                //Field 2:
-                tag = cin.ReadTag();
-                Assert.AreEqual(2, tag >> 3);
-                Assert.AreEqual(4, cin.Position);
-                int childlen = cin.ReadLength();
-                Assert.AreEqual(120, childlen);
-                Assert.AreEqual(5, cin.Position);
-                int oldlimit = cin.PushLimit((int)childlen);
-                Assert.AreEqual(5, cin.Position);
-                // Now we are reading child message
-                {
-                    // Field 11: numeric value: 500
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(11, tag >> 3);
-                    Assert.AreEqual(6, cin.Position);
-                    Assert.AreEqual(500, cin.ReadInt32());
-                    Assert.AreEqual(8, cin.Position);
-                    //Field 12: length delimited 120 bytes
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(12, tag >> 3);
-                    Assert.AreEqual(9, cin.Position);
-                    ByteString bstr = cin.ReadBytes();
-                    Assert.AreEqual(110, bstr.Length);
-                    Assert.AreEqual((byte) 109, bstr[109]);
-                    Assert.AreEqual(120, cin.Position);
-                    // Field 13: fixed numeric value: 501
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(13, tag >> 3);
-                    // ROK - Previously broken here, this returned 126 failing to account for bufferSizeAfterLimit
-                    Assert.AreEqual(121, cin.Position);
-                    Assert.AreEqual(501, cin.ReadSFixed32());
-                    Assert.AreEqual(125, cin.Position);
-                    Assert.IsTrue(cin.IsAtEnd);
-                }
-                cin.PopLimit(oldlimit);
-                Assert.AreEqual(125, cin.Position);
-                // Field 3: fixed numeric value: 501
-                tag = cin.ReadTag();
-                Assert.AreEqual(3, tag >> 3);
-                Assert.AreEqual(126, cin.Position);
-                Assert.AreEqual(501, cin.ReadSFixed32());
-                Assert.AreEqual(130, cin.Position);
-                Assert.IsTrue(cin.IsAtEnd);
-            }
-        }
-
-        [Test]
-        public void Dispose_DisposesUnderlyingStream()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanWrite);
-            using (var cos = new CodedOutputStream(memoryStream))
-            {
-                cos.WriteRawByte(0);
-                Assert.AreEqual(0, memoryStream.Position); // Not flushed yet
-            }
-            Assert.AreEqual(1, memoryStream.ToArray().Length); // Flushed data from CodedOutputStream to MemoryStream
-            Assert.IsFalse(memoryStream.CanWrite); // Disposed
-        }
-
-        [Test]
-        public void Dispose_WithLeaveOpen()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanWrite);
-            using (var cos = new CodedOutputStream(memoryStream, true))
-            {
-                cos.WriteRawByte(0);
-                Assert.AreEqual(0, memoryStream.Position); // Not flushed yet
-            }
-            Assert.AreEqual(1, memoryStream.Position); // Flushed data from CodedOutputStream to MemoryStream
-            Assert.IsTrue(memoryStream.CanWrite); // We left the stream open
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs

@@ -1,532 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.Linq;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Tests for MapField which aren't reliant on the encoded format -
-    /// tests for serialization/deserialization are part of GeneratedMessageTest.
-    /// </summary>
-    public class MapFieldTest
-    {
-        [Test]
-        public void Clone_ClonesMessages()
-        {
-            var message = new ForeignMessage { C = 20 };
-            var map = new MapField<string, ForeignMessage> { { "x", message } };
-            var clone = map.Clone();
-            map["x"].C = 30;
-            Assert.AreEqual(20, clone["x"].C);
-        }
-
-        [Test]
-        public void NullValuesProhibited()
-        {
-            TestNullValues<int?>(0);
-            TestNullValues("");
-            TestNullValues(new TestAllTypes());
-        }
-
-        private void TestNullValues<T>(T nonNullValue)
-        {
-            var map = new MapField<int, T>();
-            var nullValue = (T) (object) null;
-            Assert.Throws<ArgumentNullException>(() => map.Add(0, nullValue));
-            Assert.Throws<ArgumentNullException>(() => map[0] = nullValue);
-            map.Add(1, nonNullValue);
-            map[1] = nonNullValue;
-        }
-
-        [Test]
-        public void Add_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map.Add(null, new ForeignMessage()));
-        }
-
-        [Test]
-        public void Indexer_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map[null] = new ForeignMessage());
-        }
-        
-        [Test]
-        public void AddPreservesInsertionOrder()
-        {
-            var map = new MapField<string, string>();
-            map.Add("a", "v1");
-            map.Add("b", "v2");
-            map.Add("c", "v3");
-            map.Remove("b");
-            map.Add("d", "v4");
-            CollectionAssert.AreEqual(new[] { "a", "c", "d" }, map.Keys);
-            CollectionAssert.AreEqual(new[] { "v1", "v3", "v4" }, map.Values);
-        }
-
-        [Test]
-        public void EqualityIsOrderInsensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "v1");
-            map1.Add("b", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("b", "v2");
-            map2.Add("a", "v1");
-
-            EqualityTester.AssertEquality(map1, map2);
-        }
-
-        [Test]
-        public void EqualityIsKeySensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("first key", "v1");
-            map1.Add("second key", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("third key", "v1");
-            map2.Add("fourth key", "v2");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Equality_Simple()
-        {
-            var map = new MapField<string, string>();
-            EqualityTester.AssertEquality(map, map);
-            EqualityTester.AssertInequality(map, null);
-            Assert.IsFalse(map.Equals(new object()));
-        }
-
-        [Test]
-        public void EqualityIsValueSensitive()
-        {
-            // Note: Without some care, it's a little easier than one might
-            // hope to see hash collisions, but only in some environments...
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "first value");
-            map1.Add("b", "second value");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("a", "third value");
-            map2.Add("b", "fourth value");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Add_Dictionary()
-        {
-            var map1 = new MapField<string, string>
-            {
-                { "x", "y" },
-                { "a", "b" }
-            };
-            var map2 = new MapField<string, string>
-            {
-                { "before", "" },
-                map1,
-                { "after", "" }
-            };
-            var expected = new MapField<string, string>
-            {
-                { "before", "" },
-                { "x", "y" },
-                { "a", "b" },
-                { "after", "" }
-            };
-            Assert.AreEqual(expected, map2);
-            CollectionAssert.AreEqual(new[] { "before", "x", "a", "after" }, map2.Keys);
-        }
-
-        // General IDictionary<TKey, TValue> behavior tests
-        [Test]
-        public void Add_KeyAlreadyExists()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.Throws<ArgumentException>(() => map.Add("foo", "baz"));
-        }
-
-        [Test]
-        public void Add_Pair()
-        {
-            var map = new MapField<string, string>();
-            ICollection<KeyValuePair<string, string>> collection = map;
-            collection.Add(NewKeyValuePair("x", "y"));
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<ArgumentException>(() => collection.Add(NewKeyValuePair("x", "z")));
-        }
-
-        [Test]
-        public void Contains_Pair()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.IsTrue(collection.Contains(NewKeyValuePair("x", "y")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("x", "z")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("z", "y")));
-        }
-
-        [Test]
-        public void Remove_Key()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(map.Remove("missing"));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(map.Remove("foo"));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentNullException>(() => map.Remove(null));
-        }
-
-        [Test]
-        public void Remove_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("wrong key", "bar")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("foo", "wrong value")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(collection.Remove(NewKeyValuePair("foo", "bar")));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentException>(() => collection.Remove(new KeyValuePair<string, string>(null, "")));
-        }
-
-        [Test]
-        public void CopyTo_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            KeyValuePair<string, string>[] array = new KeyValuePair<string, string>[3];
-            collection.CopyTo(array, 1);
-            Assert.AreEqual(NewKeyValuePair("foo", "bar"), array[1]);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual(1, map.Count);
-            map.Clear();
-            Assert.AreEqual(0, map.Count);
-            map.Add("x", "y");
-            Assert.AreEqual(1, map.Count);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<KeyNotFoundException>(() => { var ignored = map["z"]; });
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var map = new MapField<string, string>();
-            map["x"] = "y";
-            Assert.AreEqual("y", map["x"]);
-            map["x"] = "z"; // This won't throw, unlike Add.
-            Assert.AreEqual("z", map["x"]);
-        }
-
-        [Test]
-        public void GetEnumerator_NonGeneric()
-        {
-            IEnumerable map = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { new KeyValuePair<string, string>("x", "y") },
-                map.Cast<object>().ToList());
-        }
-
-        // Test for the explicitly-implemented non-generic IDictionary interface
-        [Test]
-        public void IDictionary_GetEnumerator()
-        {
-            IDictionary map = new MapField<string, string> { { "x", "y" } };
-            var enumerator = map.GetEnumerator();
-
-            // Commented assertions show an ideal situation - it looks like
-            // the LinkedList enumerator doesn't throw when you ask for the current entry
-            // at an inappropriate time; fixing this would be more work than it's worth.
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key);
-            Assert.AreEqual("y", enumerator.Value);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Current);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Entry);
-            Assert.IsFalse(enumerator.MoveNext());
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            enumerator.Reset();
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key); // Assume the rest are okay
-        }
-
-        [Test]
-        public void IDictionary_Add()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Add("a", "b");
-            Assert.AreEqual("b", map["a"]);
-            Assert.Throws<ArgumentException>(() => dictionary.Add("a", "duplicate"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add(new object(), "key is bad"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add("value is bad", new object()));
-        }
-
-        [Test]
-        public void IDictionary_Contains()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-
-            Assert.IsFalse(dictionary.Contains("a"));
-            Assert.IsFalse(dictionary.Contains(5));
-            // Surprising, but IDictionary.Contains is only about keys.
-            Assert.IsFalse(dictionary.Contains(new DictionaryEntry("x", "y")));
-            Assert.IsTrue(dictionary.Contains("x"));
-        }
-
-        [Test]
-        public void IDictionary_Remove()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Remove("a");
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(5);
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(new DictionaryEntry("x", "y"));
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove("x");
-            Assert.AreEqual(0, dictionary.Count);
-            Assert.Throws<ArgumentNullException>(() => dictionary.Remove(null));
-        }
-
-        [Test]
-        public void IDictionary_CopyTo()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            var array = new DictionaryEntry[3];
-            dictionary.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { default(DictionaryEntry), new DictionaryEntry("x", "y"), default(DictionaryEntry) },
-                array);
-            var objectArray = new object[3];
-            dictionary.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new object[] { null, new DictionaryEntry("x", "y"), null },
-                objectArray);
-        }
-
-        [Test]
-        public void IDictionary_IsFixedSize()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            Assert.IsFalse(dictionary.IsFixedSize);
-        }
-
-        [Test]
-        public void IDictionary_Keys()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "x" }, dictionary.Keys);
-        }
-
-        [Test]
-        public void IDictionary_Values()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "y" }, dictionary.Values);
-        }
-
-        [Test]
-        public void IDictionary_IsSynchronized()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.IsFalse(dictionary.IsSynchronized);
-        }
-
-        [Test]
-        public void IDictionary_SyncRoot()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreSame(dictionary, dictionary.SyncRoot);
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Get()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", dictionary["x"]);
-            Assert.IsNull(dictionary["a"]);
-            Assert.IsNull(dictionary[5]);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null].GetHashCode());
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Set()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            map["a"] = "b";
-            Assert.AreEqual("b", map["a"]);
-            map["a"] = "c";
-            Assert.AreEqual("c", map["a"]);
-            Assert.Throws<InvalidCastException>(() => dictionary[5] = "x");
-            Assert.Throws<InvalidCastException>(() => dictionary["x"] = 5);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null] = "z");
-            Assert.Throws<ArgumentNullException>(() => dictionary["x"] = null);
-        }
-
-        [Test]
-        public void KeysReturnsLiveView()
-        {
-            var map = new MapField<string, string>();
-            var keys = map.Keys;
-            CollectionAssert.AreEqual(new string[0], keys);
-            map["foo"] = "bar";
-            map["x"] = "y";
-            CollectionAssert.AreEqual(new[] { "foo", "x" }, keys);
-        }
-
-        [Test]
-        public void ValuesReturnsLiveView()
-        {
-            var map = new MapField<string, string>();
-            var values = map.Values;
-            CollectionAssert.AreEqual(new string[0], values);
-            map["foo"] = "bar";
-            map["x"] = "y";
-            CollectionAssert.AreEqual(new[] { "bar", "y" }, values);
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void ViewsAreReadOnly()
-        {
-            var map = new MapField<string, string>();
-            var keys = map.Keys;
-            Assert.IsTrue(keys.IsReadOnly);
-            Assert.Throws<NotSupportedException>(() => keys.Clear());
-            Assert.Throws<NotSupportedException>(() => keys.Remove("a"));
-            Assert.Throws<NotSupportedException>(() => keys.Add("a"));
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void ViewCopyTo()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys;
-            var array = new string[4];
-            Assert.Throws<ArgumentException>(() => keys.CopyTo(array, 3));
-            Assert.Throws<ArgumentOutOfRangeException>(() => keys.CopyTo(array, -1));
-            keys.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { null, "foo", "x", null }, array);
-        }
-        
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void NonGenericViewCopyTo()
-        {
-            IDictionary map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            ICollection keys = map.Keys;
-            // Note the use of the Array type here rather than string[]
-            Array array = new string[4];
-            Assert.Throws<ArgumentException>(() => keys.CopyTo(array, 3));
-            Assert.Throws<ArgumentOutOfRangeException>(() => keys.CopyTo(array, -1));
-            keys.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { null, "foo", "x", null }, array);
-        }
-
-        [Test]
-        public void KeysContains()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys;
-            Assert.IsTrue(keys.Contains("foo"));
-            Assert.IsFalse(keys.Contains("bar")); // It's a value!
-            Assert.IsFalse(keys.Contains("1"));
-            // Keys can't be null, so we should prevent contains check
-            Assert.Throws<ArgumentNullException>(() => keys.Contains(null));
-        }
-
-        [Test]
-        public void ValuesContains()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var values = map.Values;
-            Assert.IsTrue(values.Contains("bar"));
-            Assert.IsFalse(values.Contains("foo")); // It's a key!
-            Assert.IsFalse(values.Contains("1"));
-            // Values can be null, so this makes sense
-            Assert.IsFalse(values.Contains(null));
-        }
-
-        [Test]
-        public void ToString_StringToString()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            Assert.AreEqual("{ \"foo\": \"bar\", \"x\": \"y\" }", map.ToString());
-        }
-
-        [Test]
-        public void ToString_UnsupportedKeyType()
-        {
-            var map = new MapField<byte, string> { { 10, "foo" } };
-            Assert.Throws<ArgumentException>(() => map.ToString());
-        }
-
-        private static KeyValuePair<TKey, TValue> NewKeyValuePair<TKey, TValue>(TKey key, TValue value)
-        {
-            return new KeyValuePair<TKey, TValue>(key, value);
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs

@@ -1,746 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Collections
-{
-    public class RepeatedFieldTest
-    {
-        [Test]
-        public void NullValuesRejected()
-        {
-            var list = new RepeatedField<string>();
-            Assert.Throws<ArgumentNullException>(() => list.Add((string)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((IEnumerable<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((RepeatedField<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Contains(null));
-            Assert.Throws<ArgumentNullException>(() => list.IndexOf(null));
-        }
-
-        [Test]
-        public void Add_SingleItem()
-        {
-            var list = new RepeatedField<string>();
-            list.Add("foo");
-            Assert.AreEqual(1, list.Count);
-            Assert.AreEqual("foo", list[0]);
-        }
-
-        [Test]
-        public void Add_Sequence()
-        {
-            var list = new RepeatedField<string>();
-            list.Add(new[] { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_SlowPath()
-        {
-            var list = new RepeatedField<string>();
-            list.AddRange(new[] { "foo", "bar" }.Select(x => x));
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_SlowPath_NullsProhibited_ReferenceType()
-        {
-            var list = new RepeatedField<string>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new[] { "foo", null }.Select(x => x)));
-        }
-
-        [Test]
-        public void AddRange_SlowPath_NullsProhibited_NullableValueType()
-        {
-            var list = new RepeatedField<int?>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new[] { 20, (int?)null }.Select(x => x)));
-        }
-
-        [Test]
-        public void AddRange_Optimized_NonNullableValueType()
-        {
-            var list = new RepeatedField<int>();
-            list.AddRange(new List<int> { 20, 30 });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual(20, list[0]);
-            Assert.AreEqual(30, list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_ReferenceType()
-        {
-            var list = new RepeatedField<string>();
-            list.AddRange(new List<string> { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullableValueType()
-        {
-            var list = new RepeatedField<int?>();
-            list.AddRange(new List<int?> { 20, 30 });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual((int?) 20, list[0]);
-            Assert.AreEqual((int?) 30, list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullsProhibited_ReferenceType()
-        {
-            // We don't just trust that a collection with a nullable element type doesn't contain nulls
-            var list = new RepeatedField<string>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new List<string> { "foo", null }));
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullsProhibited_NullableValueType()
-        {
-            // We don't just trust that a collection with a nullable element type doesn't contain nulls
-            var list = new RepeatedField<int?>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new List<int?> { 20, null }));
-        }
-
-        [Test]
-        public void AddRange_AlreadyNotEmpty()
-        {
-            var list = new RepeatedField<int> { 1, 2, 3 };
-            list.AddRange(new List<int> { 4, 5, 6 });
-            CollectionAssert.AreEqual(new[] { 1, 2, 3, 4, 5, 6 }, list);
-        }
-
-        [Test]
-        public void AddRange_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "original" };
-            list.AddRange(new RepeatedField<string> { "foo", "bar" });
-            Assert.AreEqual(3, list.Count);
-            Assert.AreEqual("original", list[0]);
-            Assert.AreEqual("foo", list[1]);
-            Assert.AreEqual("bar", list[2]);
-        }
-
-        [Test]
-        public void RemoveAt_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            list.RemoveAt(1);
-            CollectionAssert.AreEqual(new[] { "first", "third" }, list);
-            // Just check that these don't throw...
-            list.RemoveAt(list.Count - 1); // Now the count will be 1...
-            list.RemoveAt(0);
-            Assert.AreEqual(0, list.Count);
-        }
-
-        [Test]
-        public void RemoveAt_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(-1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(3));
-        }
-
-        [Test]
-        public void Insert_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-            list.Insert(3, "end");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second", "end" }, list);
-            list.Insert(0, "start");
-            CollectionAssert.AreEqual(new[] { "start", "first", "middle", "second", "end" }, list);
-        }
-
-        [Test]
-        public void Insert_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(-1, "foo"));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(3, "foo"));
-            Assert.Throws<ArgumentNullException>(() => list.Insert(0, null));
-        }
-
-        [Test]
-        public void Equals_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((RepeatedField<string>) null));
-            Assert.IsTrue(list.Equals(list));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals(new RepeatedField<string> { "first", "second" }));
-        }
-
-        [Test]
-        public void Equals_Object()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((object) null));
-            Assert.IsTrue(list.Equals((object) list));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals((object) new RepeatedField<string> { "first", "second" }));
-            Assert.IsFalse(list.Equals(new object()));
-        }
-
-        [Test]
-        public void GetEnumerator_GenericInterface()
-        {
-            IEnumerable<string> list = new RepeatedField<string> { "first", "second" };
-            // Select gets rid of the optimizations in ToList...
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Select(x => x).ToList());
-        }
-
-        [Test]
-        public void GetEnumerator_NonGenericInterface()
-        {
-            IEnumerable list = new RepeatedField<string> { "first", "second" };
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Cast<object>().ToList());
-        }
-
-        [Test]
-        public void CopyTo()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, stringArray);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual("first", list[0]);
-            Assert.AreEqual("second", list[1]);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1].GetHashCode());
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2].GetHashCode());
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list[0] = "changed";
-            Assert.AreEqual("changed", list[0]);
-            Assert.Throws<ArgumentNullException>(() => list[0] = null);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1] = "bad");
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2] = "bad");
-        }
-
-        [Test]
-        public void Clone_ReturnsMutable()
-        {
-            var list = new RepeatedField<int> { 0 };
-            var clone = list.Clone();
-            clone[0] = 1;
-        }
-
-        [Test]
-        public void Enumerator()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            using (var enumerator = list.GetEnumerator())
-            {
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("first", enumerator.Current);
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("second", enumerator.Current);
-                Assert.IsFalse(enumerator.MoveNext());
-                Assert.IsFalse(enumerator.MoveNext());
-            }
-        }
-
-        [Test]
-        public void AddEntriesFrom_PackedInt32()
-        {
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var length = CodedOutputStream.ComputeInt32Size(10)
-                + CodedOutputStream.ComputeInt32Size(999)
-                + CodedOutputStream.ComputeInt32Size(-1000);
-            output.WriteTag(packedTag);
-            output.WriteRawVarint32((uint) length);
-            output.WriteInt32(10);
-            output.WriteInt32(999);
-            output.WriteInt32(-1000);
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a non-packed tag, but we detect that the data is
-            // actually packed.
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(packedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(nonPackedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_NonPackedInt32()
-        {
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(10);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(999);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(-1000); // Just for variety...
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a packed tag, but we detect that the data is
-            // actually not packed.
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(nonPackedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(packedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteString("Foo");
-            output.WriteTag(tag);
-            output.WriteString("");
-            output.WriteTag(tag);
-            output.WriteString("Bar");
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<string>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForString(tag));
-            CollectionAssert.AreEqual(new[] { "Foo", "", "Bar" }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_Message()
-        {
-            var message1 = new ForeignMessage { C = 2000 };
-            var message2 = new ForeignMessage { C = -250 };
-
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteMessage(message1);
-            output.WriteTag(tag);
-            output.WriteMessage(message2);
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<ForeignMessage>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            CollectionAssert.AreEqual(new[] { message1, message2}, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_PackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int> { 10, 1000, 1000000 };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            var length = input.ReadLength();
-            Assert.AreEqual(10, input.ReadInt32());
-            Assert.AreEqual(1000, input.ReadInt32());
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-            Assert.AreEqual(1 + CodedOutputStream.ComputeLengthSize(length) + length, stream.Length);
-        }
-
-        [Test]
-        public void WriteTo_NonPackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var field = new RepeatedField<int> { 10, 1000, 1000000};
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(10, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<string> { "Foo", "", "Bar" };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForString(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Foo", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Bar", input.ReadString());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_Message()
-        {
-            var message1 = new ForeignMessage { C = 20 };
-            var message2 = new ForeignMessage { C = 25 };
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<ForeignMessage> { message1, message2 };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message1, input.ReadMessage(ForeignMessage.Parser));
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message2, input.ReadMessage(ForeignMessage.Parser));
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Varint);
-            // 2 bytes for the first entry, 3 bytes for the second, 2 bytes for the third
-            Assert.AreEqual(7, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Fixed32);
-            // 5 bytes for the each entry
-            Assert.AreEqual(15, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1};
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length,
-            // 1 byte for the first entry, 2 bytes for the second, 1 byte for the third
-            Assert.AreEqual(6, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length, 4 bytes per entry
-            Assert.AreEqual(14, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void TestNegativeEnumArray()
-        {
-            int arraySize = 1 + 1 + (11 * 5);
-            int msgSize = arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.Varint);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteTag(tag);
-                output.WriteEnum(i);
-            }
-
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = new CodedInputStream(bytes);
-            tag = input.ReadTag();
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-
-        [Test]
-        public void TestNegativeEnumPackedArray()
-        {
-            int arraySize = 1 + (10 * 5);
-            int msgSize = 1 + 1 + arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            // Length-delimited to show we want the packed representation
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.LengthDelimited);
-            output.WriteTag(tag);
-            int size = 0;
-            for (int i = 0; i >= -5; i--)
-            {
-                size += CodedOutputStream.ComputeEnumSize(i);
-            }
-            output.WriteRawVarint32((uint)size);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteEnum(i);
-            }
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = new CodedInputStream(bytes);
-            tag = input.ReadTag();
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-        // Fairly perfunctory tests for the non-generic IList implementation
-        [Test]
-        public void IList_Indexer()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.AreEqual("first", list[0]);
-            list[1] = "changed";
-            Assert.AreEqual("changed", field[1]);
-        }
-
-        [Test]
-        public void IList_Contains()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsTrue(list.Contains("second"));
-            Assert.IsFalse(list.Contains("third"));
-            Assert.IsFalse(list.Contains(new object()));
-        }
-
-        [Test]
-        public void IList_Add()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Add("third");
-            CollectionAssert.AreEqual(new[] { "first", "second", "third" }, list);
-        }
-
-        [Test]
-        public void IList_Remove()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Remove("third"); // No-op, no exception
-            list.Remove(new object()); // No-op, no exception
-            list.Remove("first");
-            CollectionAssert.AreEqual(new[] { "second" }, list);
-        }
-
-        [Test]
-        public void IList_IsFixedSize()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.IsFalse(list.IsFixedSize);
-        }
-
-        [Test]
-        public void IList_IndexOf()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual(1, list.IndexOf("second"));
-            Assert.AreEqual(-1, list.IndexOf("third"));
-            Assert.AreEqual(-1, list.IndexOf(new object()));
-        }
-
-        [Test]
-        public void IList_SyncRoot()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreSame(list, list.SyncRoot);
-        }
-
-        [Test]
-        public void IList_CopyTo()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first",  "second", null }, stringArray);
-
-            object[] objectArray = new object[4];
-            list.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, objectArray);
-
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new StringBuilder[4], 1));
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new int[4], 1));
-        }
-
-        [Test]
-        public void IList_IsSynchronized()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.IsSynchronized);
-        }
-
-        [Test]
-        public void IList_Insert()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-        }
-
-        [Test]
-        public void ToString_Integers()
-        {
-            var list = new RepeatedField<int> { 5, 10, 20 };
-            var text = list.ToString();
-            Assert.AreEqual("[ 5, 10, 20 ]", text);
-        }
-
-        [Test]
-        public void ToString_Strings()
-        {
-            var list = new RepeatedField<string> { "x", "y", "z" };
-            var text = list.ToString();
-            Assert.AreEqual("[ \"x\", \"y\", \"z\" ]", text);
-        }
-
-        [Test]
-        public void ToString_Messages()
-        {
-            var list = new RepeatedField<TestAllTypes> { new TestAllTypes { SingleDouble = 1.5 }, new TestAllTypes { SingleInt32 = 10 } };
-            var text = list.ToString();
-            Assert.AreEqual("[ { \"singleDouble\": 1.5 }, { \"singleInt32\": 10 } ]", text);
-        }
-
-        [Test]
-        public void ToString_Empty()
-        {
-            var list = new RepeatedField<TestAllTypes> { };
-            var text = list.ToString();
-            Assert.AreEqual("[ ]", text);
-        }
-
-        [Test]
-        public void ToString_InvalidElementType()
-        {
-            var list = new RepeatedField<decimal> { 15m };
-            Assert.Throws<ArgumentException>(() => list.ToString());
-        }
-
-        [Test]
-        public void ToString_Timestamp()
-        {
-            var list = new RepeatedField<Timestamp> { Timestamp.FromDateTime(new DateTime(2015, 10, 1, 12, 34, 56, DateTimeKind.Utc)) };
-            var text = list.ToString();
-            Assert.AreEqual("[ \"2015-10-01T12:34:56Z\" ]", text);
-        }
-
-        [Test]
-        public void ToString_Struct()
-        {
-            var message = new Struct { Fields = { { "foo", new Value { NumberValue = 20 } } } };
-            var list = new RepeatedField<Struct> { message };
-            var text = list.ToString();
-            Assert.AreEqual(text, "[ { \"foo\": 20 } ]", message.ToString());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs

@@ -1,98 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System.Reflection;
-
-namespace Google.Protobuf.Compatibility
-{
-    public class PropertyInfoExtensionsTest
-    {
-        public string PublicReadWrite { get; set; }
-        private string PrivateReadWrite { get; set; }
-        public string PublicReadPrivateWrite { get; private set; }
-        public string PrivateReadPublicWrite { private get; set; }
-        public string PublicReadOnly { get { return null; } }
-        private string PrivateReadOnly { get { return null; } }
-        public string PublicWriteOnly { set { } }
-        private string PrivateWriteOnly { set {  } }
-
-        [Test]
-        [TestCase("PublicReadWrite")]
-        [TestCase("PublicReadPrivateWrite")]
-        [TestCase("PublicReadOnly")]
-        public void GetGetMethod_Success(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNotNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PrivateReadWrite")]
-        [TestCase("PrivateReadPublicWrite")]
-        [TestCase("PrivateReadOnly")]
-        [TestCase("PublicWriteOnly")]
-        [TestCase("PrivateWriteOnly")]
-        public void GetGetMethod_NoAccessibleGetter(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PublicReadWrite")]
-        [TestCase("PrivateReadPublicWrite")]
-        [TestCase("PublicWriteOnly")]
-        public void GetSetMethod_Success(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNotNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PublicReadPrivateWrite")]
-        [TestCase("PrivateReadWrite")]
-        [TestCase("PrivateReadOnly")]
-        [TestCase("PublicReadOnly")]
-        [TestCase("PrivateWriteOnly")]
-        public void GetSetMethod_NoAccessibleGetter(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
-        }
-    }
-
-}

csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs

@@ -1,117 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-#if !DOTNET35
-namespace Google.Protobuf.Compatibility
-{
-    public class TypeExtensionsTest
-    {
-        public class DerivedList : List<string> { }
-        public string PublicProperty { get; set; }
-        private string PrivateProperty { get; set; }
-
-        public void PublicMethod()
-        {
-        }
-
-        private void PrivateMethod()
-        {
-        }
-
-        [Test]
-        [TestCase(typeof(object), typeof(string), true)]
-        [TestCase(typeof(object), typeof(int), true)]
-        [TestCase(typeof(string), typeof(string), true)]
-        [TestCase(typeof(string), typeof(object), false)]
-        [TestCase(typeof(string), typeof(int), false)]
-        [TestCase(typeof(int), typeof(int), true)]
-        [TestCase(typeof(ValueType), typeof(int), true)]
-        [TestCase(typeof(long), typeof(int), false)] // 
-        public void IsAssignableFrom(Type target, Type argument, bool expected)
-        {
-            Assert.AreEqual(expected, TypeExtensions.IsAssignableFrom(target, argument));
-        }
-
-        [Test]
-        [TestCase(typeof(DerivedList), "Count")] // Go up the type hierarchy
-        [TestCase(typeof(List<string>), "Count")]
-        [TestCase(typeof(List<>), "Count")]
-        [TestCase(typeof(TypeExtensionsTest), "PublicProperty")]
-        public void GetProperty_Success(Type type, string name)
-        {
-            var property = TypeExtensions.GetProperty(type, name);
-            Assert.IsNotNull(property);
-            Assert.AreEqual(name, property.Name);
-        }
-
-        [Test]
-        [TestCase(typeof(TypeExtensionsTest), "PrivateProperty")]
-        [TestCase(typeof(TypeExtensionsTest), "Garbage")]
-        public void GetProperty_NoSuchProperty(Type type, string name)
-        {
-            var property = TypeExtensions.GetProperty(type, name);
-            Assert.IsNull(property);
-        }
-
-        [Test]
-        [TestCase(typeof(DerivedList), "RemoveAt")] // Go up the type hierarchy
-        [TestCase(typeof(List<>), "RemoveAt")]
-        [TestCase(typeof(TypeExtensionsTest), "PublicMethod")]
-        public void GetMethod_Success(Type type, string name)
-        {
-            var method = TypeExtensions.GetMethod(type, name);
-            Assert.IsNotNull(method);
-            Assert.AreEqual(name, method.Name);
-        }
-
-        [Test]
-        [TestCase(typeof(TypeExtensionsTest), "PrivateMethod")]
-        [TestCase(typeof(TypeExtensionsTest), "GarbageMethod")]
-        public void GetMethod_NoSuchMethod(Type type, string name)
-        {
-            var method = TypeExtensions.GetMethod(type, name);
-            Assert.IsNull(method);
-        }
-
-        [Test]
-        [TestCase(typeof(List<string>), "IndexOf")]
-        public void GetMethod_Ambiguous(Type type, string name)
-        {
-            Assert.Throws<AmbiguousMatchException>(() => TypeExtensions.GetMethod(type, name));
-        }
-    }
-}
-#endif

csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs

@@ -1,55 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.Reflection;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class DeprecatedMemberTest
-    {
-        private static void AssertIsDeprecated(MemberInfo member)
-        {
-            Assert.NotNull(member);
-            Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member);
-        }
-
-        [Test]
-        public void TestDepreatedPrimitiveValue()
-        {
-            AssertIsDeprecated(typeof(TestDeprecatedFields).GetProperty("DeprecatedInt32"));
-        }
-
-    }
-}

csharp/src/Google.Protobuf.Test/EqualityTester.cs

@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods when testing equality. NUnit's Assert.AreEqual and
-    /// Assert.AreNotEqual methods try to be clever with collections, which can
-    /// be annoying...
-    /// </summary>
-    internal static class EqualityTester
-    {
-        public static void AssertEquality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsTrue(first.Equals(second));
-            Assert.IsTrue(first.Equals((object) second));
-            Assert.AreEqual(first.GetHashCode(), second.GetHashCode());
-        }
-
-        public static void AssertInequality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsFalse(first.Equals(second));
-            Assert.IsFalse(first.Equals((object) second));
-            // While this isn't a requirement, the chances of this test failing due to
-            // coincidence rather than a bug are very small.
-            if (first != null && second != null)
-            {
-                Assert.AreNotEqual(first.GetHashCode(), second.GetHashCode());
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/FieldCodecTest.cs

@@ -1,196 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class FieldCodecTest
-    {
-#pragma warning disable 0414 // Used by tests via reflection - do not remove!
-        private static readonly List<ICodecTestData> Codecs = new List<ICodecTestData>
-        {
-            new FieldCodecTestData<bool>(FieldCodec.ForBool(100), true, "Bool"),
-            new FieldCodecTestData<string>(FieldCodec.ForString(100), "sample", "String"),
-            new FieldCodecTestData<ByteString>(FieldCodec.ForBytes(100), ByteString.CopyFrom(1, 2, 3), "Bytes"),
-            new FieldCodecTestData<int>(FieldCodec.ForInt32(100), -1000, "Int32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSInt32(100), -1000, "SInt32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSFixed32(100), -1000, "SFixed32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForUInt32(100), 1234, "UInt32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForFixed32(100), 1234, "Fixed32"),
-            new FieldCodecTestData<long>(FieldCodec.ForInt64(100), -1000, "Int64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSInt64(100), -1000, "SInt64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSFixed64(100), -1000, "SFixed64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForUInt64(100), 1234, "UInt64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForFixed64(100), 1234, "Fixed64"),
-            new FieldCodecTestData<float>(FieldCodec.ForFloat(100), 1234.5f, "Float"),
-            new FieldCodecTestData<double>(FieldCodec.ForDouble(100), 1234567890.5d, "Double"),
-            new FieldCodecTestData<ForeignEnum>(
-                FieldCodec.ForEnum(100, t => (int) t, t => (ForeignEnum) t), ForeignEnum.ForeignBaz, "Enum"),
-            new FieldCodecTestData<ForeignMessage>(
-                FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
-        };
-#pragma warning restore 0414
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripWithTag(ICodecTestData codec)
-        {
-            codec.TestRoundTripWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripRaw(ICodecTestData codec)
-        {
-            codec.TestRoundTripRaw();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void CalculateSize(ICodecTestData codec)
-        {
-            codec.TestCalculateSizeWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void DefaultValue(ICodecTestData codec)
-        {
-            codec.TestDefaultValue();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void FixedSize(ICodecTestData codec)
-        {
-            codec.TestFixedSize();
-        }
-
-        // This is ugly, but it means we can have a non-generic interface.
-        // It feels like NUnit should support this better, but I don't know
-        // of any better ways right now.
-        public interface ICodecTestData
-        {
-            void TestRoundTripRaw();
-            void TestRoundTripWithTag();
-            void TestCalculateSizeWithTag();
-            void TestDefaultValue();
-            void TestFixedSize();
-        }
-
-        public class FieldCodecTestData<T> : ICodecTestData
-        {
-            private readonly FieldCodec<T> codec;
-            private readonly T sampleValue;
-            private readonly string name;
-
-            public FieldCodecTestData(FieldCodec<T> codec, T sampleValue, string name)
-            {
-                this.codec = codec;
-                this.sampleValue = sampleValue;
-                this.name = name;
-            }
-
-            public void TestRoundTripRaw()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.ValueWriter(codedOutput, sampleValue);
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = new CodedInputStream(stream);
-                Assert.AreEqual(sampleValue, codec.ValueReader(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestRoundTripWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = new CodedInputStream(stream);
-                codedInput.AssertNextTag(codec.Tag);
-                Assert.AreEqual(sampleValue, codec.Read(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestCalculateSizeWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                Assert.AreEqual(stream.Position, codec.CalculateSizeWithTag(sampleValue));
-            }
-
-            public void TestDefaultValue()
-            {
-                // WriteTagAndValue ignores default values
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, codec.DefaultValue);
-                codedOutput.Flush();
-                Assert.AreEqual(0, stream.Position);
-                Assert.AreEqual(0, codec.CalculateSizeWithTag(codec.DefaultValue));
-                if (typeof(T).GetTypeInfo().IsValueType)
-                {
-                    Assert.AreEqual(default(T), codec.DefaultValue);
-                }
-
-                // The plain ValueWriter/ValueReader delegates don't.
-                if (codec.DefaultValue != null) // This part isn't appropriate for message types.
-                {
-                    codedOutput = new CodedOutputStream(stream);
-                    codec.ValueWriter(codedOutput, codec.DefaultValue);
-                    codedOutput.Flush();
-                    Assert.AreNotEqual(0, stream.Position);
-                    Assert.AreEqual(stream.Position, codec.ValueSizeCalculator(codec.DefaultValue));
-                    stream.Position = 0;
-                    var codedInput = new CodedInputStream(stream);
-                    Assert.AreEqual(codec.DefaultValue, codec.ValueReader(codedInput));
-                }
-            }
-
-            public void TestFixedSize()
-            {
-                Assert.AreEqual(name.Contains("Fixed"), codec.FixedSize != 0);
-            }
-
-            public override string ToString()
-            {
-                return name;
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs

@@ -1,723 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Google.Protobuf.WellKnownTypes;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests around the generated TestAllTypes message.
-    /// </summary>
-    public class GeneratedMessageTest
-    {
-        [Test]
-        public void EmptyMessageFieldDistinctFromMissingMessageField()
-        {
-            // This demonstrates what we're really interested in...
-            var message1 = new TestAllTypes { SingleForeignMessage = new ForeignMessage() };
-            var message2 = new TestAllTypes(); // SingleForeignMessage is null
-            EqualityTester.AssertInequality(message1, message2);
-        }
-
-        [Test]
-        public void DefaultValues()
-        {
-            // Single fields
-            var message = new TestAllTypes();
-            Assert.AreEqual(false, message.SingleBool);
-            Assert.AreEqual(ByteString.Empty, message.SingleBytes);
-            Assert.AreEqual(0.0, message.SingleDouble);
-            Assert.AreEqual(0, message.SingleFixed32);
-            Assert.AreEqual(0L, message.SingleFixed64);
-            Assert.AreEqual(0.0f, message.SingleFloat);
-            Assert.AreEqual(ForeignEnum.ForeignUnspecified, message.SingleForeignEnum);
-            Assert.IsNull(message.SingleForeignMessage);
-            Assert.AreEqual(ImportEnum.Unspecified, message.SingleImportEnum);
-            Assert.IsNull(message.SingleImportMessage);
-            Assert.AreEqual(0, message.SingleInt32);
-            Assert.AreEqual(0L, message.SingleInt64);
-            Assert.AreEqual(TestAllTypes.Types.NestedEnum.Unspecified, message.SingleNestedEnum);
-            Assert.IsNull(message.SingleNestedMessage);
-            Assert.IsNull(message.SinglePublicImportMessage);
-            Assert.AreEqual(0, message.SingleSfixed32);
-            Assert.AreEqual(0L, message.SingleSfixed64);
-            Assert.AreEqual(0, message.SingleSint32);
-            Assert.AreEqual(0L, message.SingleSint64);
-            Assert.AreEqual("", message.SingleString);
-            Assert.AreEqual(0U, message.SingleUint32);
-            Assert.AreEqual(0UL, message.SingleUint64);
-
-            // Repeated fields
-            Assert.AreEqual(0, message.RepeatedBool.Count);
-            Assert.AreEqual(0, message.RepeatedBytes.Count);
-            Assert.AreEqual(0, message.RepeatedDouble.Count);
-            Assert.AreEqual(0, message.RepeatedFixed32.Count);
-            Assert.AreEqual(0, message.RepeatedFixed64.Count);
-            Assert.AreEqual(0, message.RepeatedFloat.Count);
-            Assert.AreEqual(0, message.RepeatedForeignEnum.Count);
-            Assert.AreEqual(0, message.RepeatedForeignMessage.Count);
-            Assert.AreEqual(0, message.RepeatedImportEnum.Count);
-            Assert.AreEqual(0, message.RepeatedImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedNestedEnum.Count);
-            Assert.AreEqual(0, message.RepeatedNestedMessage.Count);
-            Assert.AreEqual(0, message.RepeatedPublicImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed32.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed64.Count);
-            Assert.AreEqual(0, message.RepeatedSint32.Count);
-            Assert.AreEqual(0, message.RepeatedSint64.Count);
-            Assert.AreEqual(0, message.RepeatedString.Count);
-            Assert.AreEqual(0, message.RepeatedUint32.Count);
-            Assert.AreEqual(0, message.RepeatedUint64.Count);
-
-            // Oneof fields
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-        }
-
-        [Test]
-        public void NullStringAndBytesRejected()
-        {
-            var message = new TestAllTypes();
-            Assert.Throws<ArgumentNullException>(() => message.SingleString = null);
-            Assert.Throws<ArgumentNullException>(() => message.OneofString = null);
-            Assert.Throws<ArgumentNullException>(() => message.SingleBytes = null);
-            Assert.Throws<ArgumentNullException>(() => message.OneofBytes = null);
-        }
-
-        [Test]
-        public void RoundTrip_Empty()
-        {
-            var message = new TestAllTypes();
-            // Without setting any values, there's nothing to write.
-            byte[] bytes = message.ToByteArray();
-            Assert.AreEqual(0, bytes.Length);
-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void RoundTrip_SingleValues()
-        {
-            var message = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue
-            };
-
-            byte[] bytes = message.ToByteArray();
-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void RoundTrip_RepeatedValues()
-        {
-            var message = new TestAllTypes
-            {
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { uint.MaxValue, 23 },
-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, long.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },
-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        // Note that not every map within map_unittest_proto3 is used. They all go through very
-        // similar code paths. The fact that all maps are present is validation that we have codecs
-        // for every type.
-        [Test]
-        public void RoundTrip_Maps()
-        {
-            var message = new TestMap
-            {
-                MapBoolBool = {
-                    { false, true },
-                    { true, false }
-                },
-                MapInt32Bytes = {
-                    { 5, ByteString.CopyFrom(6, 7, 8) },
-                    { 25, ByteString.CopyFrom(1, 2, 3, 4, 5) },
-                    { 10, ByteString.Empty }
-                },
-                MapInt32ForeignMessage = {
-                    { 0, new ForeignMessage { C = 10 } },
-                    { 5, new ForeignMessage() },
-                },
-                MapInt32Enum = {
-                    { 1, MapEnum.Bar },
-                    { 2000, MapEnum.Foo }
-                }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            TestMap parsed = TestMap.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void MapWithEmptyEntry()
-        {
-            var message = new TestMap
-            {
-                MapInt32Bytes = { { 0, ByteString.Empty } }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            Assert.AreEqual(2, bytes.Length); // Tag for field entry (1 byte), length of entry (0; 1 byte)
-
-            var parsed = TestMap.Parser.ParseFrom(bytes);
-            Assert.AreEqual(1, parsed.MapInt32Bytes.Count);
-            Assert.AreEqual(ByteString.Empty, parsed.MapInt32Bytes[0]);
-        }
-
-        [Test]
-        public void MapWithOnlyValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a value.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);
-            var nestedMessage = new ForeignMessage { C = 20 };
-            // Size of the entry (tag, size written by WriteMessage, data written by WriteMessage)
-            output.WriteLength(2 + nestedMessage.CalculateSize());
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteMessage(nestedMessage);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(nestedMessage, parsed.MapInt32ForeignMessage[0]);
-        }
-
-        [Test]
-        public void MapWithOnlyKey_PrimitiveValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a key.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32DoubleFieldNumber, WireFormat.WireType.LengthDelimited);
-            int key = 10;
-            output.WriteLength(1 + CodedOutputStream.ComputeInt32Size(key));
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(0.0, parsed.MapInt32Double[key]);
-        }
-
-        [Test]
-        public void MapWithOnlyKey_MessageValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a key.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);
-            int key = 10;
-            output.WriteLength(1 + CodedOutputStream.ComputeInt32Size(key));
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(new ForeignMessage(), parsed.MapInt32ForeignMessage[key]);
-        }
-
-        [Test]
-        public void MapIgnoresExtraFieldsWithinEntryMessages()
-        {
-            // Hand-craft the stream to contain a single entry with three fields
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-
-            var key = 10; // Field 1 
-            var value = 20; // Field 2
-            var extra = 30; // Field 3
-
-            // Each field can be represented in a single byte, with a single byte tag.
-            // Total message size: 6 bytes.
-            output.WriteLength(6);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value);
-            output.WriteTag(3, WireFormat.WireType.Varint);
-            output.WriteInt32(extra);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(value, parsed.MapInt32Int32[key]);
-        }
-
-        [Test]
-        public void MapFieldOrderIsIrrelevant()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-
-            var key = 10;
-            var value = 20;
-
-            // Each field can be represented in a single byte, with a single byte tag.
-            // Total message size: 4 bytes.
-            output.WriteLength(4);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(value, parsed.MapInt32Int32[key]);
-        }
-
-        [Test]
-        public void MapNonContiguousEntries()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            // Message structure:
-            // Entry for MapInt32Int32
-            // Entry for MapStringString
-            // Entry for MapInt32Int32
-
-            // First entry
-            var key1 = 10;
-            var value1 = 20;
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key1);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value1);
-
-            // Second entry
-            var key2 = "a";
-            var value2 = "b";
-            output.WriteTag(TestMap.MapStringStringFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(6); // 3 bytes per entry: tag, size, character
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString(key2);
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteString(value2);
-
-            // Third entry
-            var key3 = 15;
-            var value3 = 25;
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key3);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value3);
-
-            output.Flush();
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            var expected = new TestMap
-            {
-                MapInt32Int32 = { { key1, value1 }, { key3, value3 } },
-                MapStringString = { { key2, value2 } }
-            };
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void DuplicateKeys_LastEntryWins()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            var key = 10;
-            var value1 = 20;
-            var value2 = 30;
-
-            // First entry
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value1);
-
-            // Second entry - same key, different value
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value2);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(value2, parsed.MapInt32Int32[key]);
-        }
-
-        [Test]
-        public void CloneSingleNonMessageValues()
-        {
-            var original = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue
-            };
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-            // Just as a single example
-            clone.SingleInt32 = 150;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneRepeatedNonMessageValues()
-        {
-            var original = new TestAllTypes
-            {
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { uint.MaxValue, 23 },
-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, long.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },
-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-            // Just as a single example
-            clone.RepeatedDouble.Add(25.5);
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneSingleMessageField()
-        {
-            var original = new TestAllTypes
-            {
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreNotSame(original.SingleNestedMessage, clone.SingleNestedMessage);
-            Assert.AreEqual(original, clone);
-
-            clone.SingleNestedMessage.Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneRepeatedMessageField()
-        {
-            var original = new TestAllTypes
-            {
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 20 } }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreNotSame(original.RepeatedNestedMessage, clone.RepeatedNestedMessage);
-            Assert.AreNotSame(original.RepeatedNestedMessage[0], clone.RepeatedNestedMessage[0]);
-            Assert.AreEqual(original, clone);
-
-            clone.RepeatedNestedMessage[0].Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneOneofField()
-        {
-            var original = new TestAllTypes
-            {
-                OneofNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-
-            // We should have cloned the message
-            original.OneofNestedMessage.Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void OneofProperties()
-        {
-            // Switch the oneof case between each of the different options, and check everything behaves
-            // as expected in each case.
-            var message = new TestAllTypes();
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-
-            message.OneofString = "sample";
-            Assert.AreEqual("sample", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-
-            var bytes = ByteString.CopyFrom(1, 2, 3);
-            message.OneofBytes = bytes;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(bytes, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofBytes, message.OneofFieldCase);
-
-            message.OneofUint32 = 20;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(20, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message.OneofFieldCase);
-
-            var nestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 25 };
-            message.OneofNestedMessage = nestedMessage;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.AreEqual(nestedMessage, message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofNestedMessage, message.OneofFieldCase);
-
-            message.ClearOneofField();
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void Oneof_DefaultValuesNotEqual()
-        {
-            var message1 = new TestAllTypes { OneofString = "" };
-            var message2 = new TestAllTypes { OneofUint32 = 0 };
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message1.OneofFieldCase);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-            Assert.AreNotEqual(message1, message2);
-        }
-
-        [Test]
-        public void OneofSerialization_NonDefaultValue()
-        {
-            var message = new TestAllTypes();
-            message.OneofString = "this would take a bit of space";
-            message.OneofUint32 = 10;
-            var bytes = message.ToByteArray();
-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - no string!
-
-            var message2 = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, message2);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-        }
-
-        [Test]
-        public void OneofSerialization_DefaultValue()
-        {
-            var message = new TestAllTypes();
-            message.OneofString = "this would take a bit of space";
-            message.OneofUint32 = 0; // This is the default value for UInt32; normally wouldn't be serialized
-            var bytes = message.ToByteArray();
-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - it's still serialized
-
-            var message2 = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, message2);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-        }
-
-        [Test]
-        public void IgnoreUnknownFields_RealDataStillRead()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var unusedFieldNumber = 23456;
-            Assert.IsFalse(TestAllTypes.Descriptor.Fields.InDeclarationOrder().Select(x => x.FieldNumber).Contains(unusedFieldNumber));
-            output.WriteTag(unusedFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteString("ignore me");
-            message.WriteTo(output);
-            output.Flush();
-
-            stream.Position = 0;
-            var parsed = TestAllTypes.Parser.ParseFrom(stream);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void IgnoreUnknownFields_AllTypes()
-        {
-            // Simple way of ensuring we can skip all kinds of fields.
-            var data = SampleMessages.CreateFullTestAllTypes().ToByteArray();
-            var empty = Empty.Parser.ParseFrom(data);
-            Assert.AreEqual(new Empty(), empty);
-        }
-
-        // This was originally seen as a conformance test failure.
-        [Test]
-        public void TruncatedMessageFieldThrows()
-        {
-            // 130, 3 is the message tag
-            // 1 is the data length - but there's no data.
-            var data = new byte[] { 130, 3, 1 };
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(data));
-        }
-
-        /// <summary>
-        /// Demonstrates current behaviour with an extraneous end group tag - see issue 688
-        /// for details; we may want to change this.
-        /// </summary>
-        [Test]
-        public void ExtraEndGroupThrows()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-
-            output.WriteTag(TestAllTypes.SingleFixed32FieldNumber, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(123);
-            output.WriteTag(100, WireFormat.WireType.EndGroup);
-
-            output.Flush();
-
-            stream.Position = 0;
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(stream));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_DirectToStringCall()
-        {
-            var message = new ForeignMessage { C = 31 };
-            Assert.AreEqual("{ \"c\": 31, \"@cInHex\": \"1f\" }", message.ToString());
-            Assert.AreEqual("{ \"c\": 31 }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_Nested()
-        {
-            var message = new TestAllTypes { SingleForeignMessage = new ForeignMessage { C = 16 } };
-            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16, \"@cInHex\": \"10\" } }", message.ToString());
-            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16 } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_DirectToTextWriterCall()
-        {
-            var message = new ForeignMessage { C = 31 };
-            var writer = new StringWriter();
-            JsonFormatter.Default.Format(message, writer);
-            Assert.AreEqual("{ \"c\": 31 }", writer.ToString());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.xproj

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>580eb013-d3c7-4578-b845-015f4a3b0591</ProjectGuid>
-    <RootNamespace>Google.Protobuf.Test</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/src/Google.Protobuf.Test/IssuesTest.cs

@@ -1,82 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using UnitTest.Issues.TestProtos;
-using NUnit.Framework;
-
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests for issues which aren't easily compartmentalized into other unit tests.
-    /// </summary>
-    public class IssuesTest
-    {
-        // Issue 45
-        [Test]
-        public void FieldCalledItem()
-        {
-            ItemField message = new ItemField { Item = 3 };
-            FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");
-            Assert.NotNull(field);
-            Assert.AreEqual(3, (int)field.Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void ReservedNames()
-        {
-            var message = new ReservedNames { Types_ = 10, Descriptor_ = 20 };
-            // Underscores aren't reflected in the JSON.
-            Assert.AreEqual("{ \"types\": 10, \"descriptor\": 20 }", message.ToString());
-        }
-
-        [Test]
-        public void JsonNameParseTest()
-        {
-            var settings = new JsonParser.Settings(10, TypeRegistry.FromFiles(UnittestIssuesReflection.Descriptor));
-            var parser = new JsonParser(settings);
-
-            // It is safe to use either original field name or explicitly specified json_name
-            Assert.AreEqual(new TestJsonName { Name = "test", Description = "test2", Guid = "test3" },
-                parser.Parse<TestJsonName>("{ \"name\": \"test\", \"desc\": \"test2\", \"guid\": \"test3\" }"));
-        }
-
-        [Test]
-        public void JsonNameFormatTest()
-        {
-            var message = new TestJsonName { Name = "test", Description = "test2", Guid = "test3" };
-            Assert.AreEqual("{ \"name\": \"test\", \"desc\": \"test2\", \"exid\": \"test3\" }",
-                JsonFormatter.Default.Format(message));
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs

@@ -1,589 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using UnitTest.Issues.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using Google.Protobuf.Reflection;
-
-using static Google.Protobuf.JsonParserTest; // For WrapInQuotes
-using System.IO;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests for the JSON formatter. Note that in these tests, double quotes are replaced with apostrophes
-    /// for the sake of readability (embedding \" everywhere is painful). See the AssertJson method for details.
-    /// </summary>
-    public class JsonFormatterTest
-    {
-        [Test]
-        public void DefaultValues_WhenOmitted()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(formatDefaultValues: false));
-
-            AssertJson("{ }", formatter.Format(new ForeignMessage()));
-            AssertJson("{ }", formatter.Format(new TestAllTypes()));
-            AssertJson("{ }", formatter.Format(new TestMap()));
-        }
-
-        [Test]
-        public void DefaultValues_WhenIncluded()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(formatDefaultValues: true));
-            AssertJson("{ 'c': 0 }", formatter.Format(new ForeignMessage()));
-        }
-
-        [Test]
-        public void AllSingleFields()
-        {
-            var message = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test\twith\ttabs",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue,
-            };
-            var actualText = JsonFormatter.Default.Format(message);
-
-            // Fields in numeric order
-            var expectedText = "{ " +
-                "'singleInt32': 100, " +
-                "'singleInt64': '3210987654321', " +
-                "'singleUint32': 4294967295, " +
-                "'singleUint64': '18446744073709551615', " +
-                "'singleSint32': -456, " +
-                "'singleSint64': '-12345678901235', " +
-                "'singleFixed32': 23, " +
-                "'singleFixed64': '1234567890123', " +
-                "'singleSfixed32': -123, " +
-                "'singleSfixed64': '-12345678901234', " +
-                "'singleFloat': 12.25, " +
-                "'singleDouble': 23.5, " +
-                "'singleBool': true, " +
-                "'singleString': 'test\\twith\\ttabs', " +
-                "'singleBytes': 'AQIDBA==', " +
-                "'singleNestedMessage': { 'bb': 35 }, " +
-                "'singleForeignMessage': { 'c': 10 }, " +
-                "'singleImportMessage': { 'd': 20 }, " +
-                "'singleNestedEnum': 'FOO', " +
-                "'singleForeignEnum': 'FOREIGN_BAR', " +
-                "'singleImportEnum': 'IMPORT_BAZ', " +
-                "'singlePublicImportMessage': { 'e': 54 }" +
-                " }";
-            AssertJson(expectedText, actualText);
-        }
-
-        [Test]
-        public void RepeatedField()
-        {
-            AssertJson("{ 'repeatedInt32': [ 1, 2, 3, 4, 5 ] }",
-                JsonFormatter.Default.Format(new TestAllTypes { RepeatedInt32 = { 1, 2, 3, 4, 5 } }));
-        }
-
-        [Test]
-        public void MapField_StringString()
-        {
-            AssertJson("{ 'mapStringString': { 'with spaces': 'bar', 'a': 'b' } }",
-                JsonFormatter.Default.Format(new TestMap { MapStringString = { { "with spaces", "bar" }, { "a", "b" } } }));
-        }
-
-        [Test]
-        public void MapField_Int32Int32()
-        {
-            // The keys are quoted, but the values aren't.
-            AssertJson("{ 'mapInt32Int32': { '0': 1, '2': 3 } }",
-                JsonFormatter.Default.Format(new TestMap { MapInt32Int32 = { { 0, 1 }, { 2, 3 } } }));
-        }
-
-        [Test]
-        public void MapField_BoolBool()
-        {
-            // The keys are quoted, but the values aren't.
-            AssertJson("{ 'mapBoolBool': { 'false': true, 'true': false } }",
-                JsonFormatter.Default.Format(new TestMap { MapBoolBool = { { false, true }, { true, false } } }));
-        }
-
-        [TestCase(1.0, "1")]
-        [TestCase(double.NaN, "'NaN'")]
-        [TestCase(double.PositiveInfinity, "'Infinity'")]
-        [TestCase(double.NegativeInfinity, "'-Infinity'")]
-        public void DoubleRepresentations(double value, string expectedValueText)
-        {
-            var message = new TestAllTypes { SingleDouble = value };
-            string actualText = JsonFormatter.Default.Format(message);
-            string expectedText = "{ 'singleDouble': " + expectedValueText + " }";
-            AssertJson(expectedText, actualText);
-        }
-
-        [Test]
-        public void UnknownEnumValueNumeric_SingleField()
-        {
-            var message = new TestAllTypes { SingleForeignEnum = (ForeignEnum) 100 };
-            AssertJson("{ 'singleForeignEnum': 100 }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueNumeric_RepeatedField()
-        {
-            var message = new TestAllTypes { RepeatedForeignEnum = { ForeignEnum.ForeignBaz, (ForeignEnum) 100, ForeignEnum.ForeignFoo } };
-            AssertJson("{ 'repeatedForeignEnum': [ 'FOREIGN_BAZ', 100, 'FOREIGN_FOO' ] }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueNumeric_MapField()
-        {
-            var message = new TestMap { MapInt32Enum = { { 1, MapEnum.Foo }, { 2, (MapEnum) 100 }, { 3, MapEnum.Bar } } };
-            AssertJson("{ 'mapInt32Enum': { '1': 'MAP_ENUM_FOO', '2': 100, '3': 'MAP_ENUM_BAR' } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValue_RepeatedField_AllEntriesUnknown()
-        {
-            var message = new TestAllTypes { RepeatedForeignEnum = { (ForeignEnum) 200, (ForeignEnum) 100 } };
-            AssertJson("{ 'repeatedForeignEnum': [ 200, 100 ] }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase("a\u17b4b", "a\\u17b4b")] // Explicit
-        [TestCase("a\u0601b", "a\\u0601b")] // Ranged
-        [TestCase("a\u0605b", "a\u0605b")] // Passthrough (note lack of double backslash...)
-        public void SimpleNonAscii(string text, string encoded)
-        {
-            var message = new TestAllTypes { SingleString = text };
-            AssertJson("{ 'singleString': '" + encoded + "' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void SurrogatePairEscaping()
-        {
-            var message = new TestAllTypes { SingleString = "a\uD801\uDC01b" };
-            AssertJson("{ 'singleString': 'a\\ud801\\udc01b' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void InvalidSurrogatePairsFail()
-        {
-            // Note: don't use TestCase for these, as the strings can't be reliably represented 
-            // See http://codeblog.jonskeet.uk/2014/11/07/when-is-a-string-not-a-string/
-
-            // Lone low surrogate
-            var message = new TestAllTypes { SingleString = "a\uDC01b" };
-            Assert.Throws<ArgumentException>(() => JsonFormatter.Default.Format(message));
-
-            // Lone high surrogate
-            message = new TestAllTypes { SingleString = "a\uD801b" };
-            Assert.Throws<ArgumentException>(() => JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase("foo_bar", "fooBar")]
-        [TestCase("bananaBanana", "bananaBanana")]
-        [TestCase("BANANABanana", "bananaBanana")]
-        public void ToCamelCase(string original, string expected)
-        {
-            Assert.AreEqual(expected, JsonFormatter.ToCamelCase(original));
-        }
-
-        [Test]
-        [TestCase(null, "{ }")]
-        [TestCase("x", "{ 'fooString': 'x' }")]
-        [TestCase("", "{ 'fooString': '' }")]
-        public void Oneof(string fooStringValue, string expectedJson)
-        {
-            var message = new TestOneof();
-            if (fooStringValue != null)
-            {
-                message.FooString = fooStringValue;
-            }
-
-            // We should get the same result both with and without "format default values".
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false));
-            AssertJson(expectedJson, formatter.Format(message));
-            formatter = new JsonFormatter(new JsonFormatter.Settings(true));
-            AssertJson(expectedJson, formatter.Format(message));
-        }
-
-        [Test]
-        public void WrapperFormatting_Single()
-        {
-            // Just a few examples, handling both classes and value types, and
-            // default vs non-default values
-            var message = new TestWellKnownTypes
-            {
-                Int64Field = 10,
-                Int32Field = 0,
-                BytesField = ByteString.FromBase64("ABCD"),
-                StringField = ""
-            };
-            var expectedJson = "{ 'int64Field': '10', 'int32Field': 0, 'stringField': '', 'bytesField': 'ABCD' }";
-            AssertJson(expectedJson, JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void WrapperFormatting_Message()
-        {
-            Assert.AreEqual("\"\"", JsonFormatter.Default.Format(new StringValue()));
-            Assert.AreEqual("0", JsonFormatter.Default.Format(new Int32Value()));
-        }
-
-        [Test]
-        public void WrapperFormatting_IncludeNull()
-        {
-            // The actual JSON here is very large because there are lots of fields. Just test a couple of them.
-            var message = new TestWellKnownTypes { Int32Field = 10 };
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(true));
-            var actualJson = formatter.Format(message);
-            Assert.IsTrue(actualJson.Contains("\"int64Field\": null"));
-            Assert.IsFalse(actualJson.Contains("\"int32Field\": null"));
-        }
-
-        [Test]
-        public void OutputIsInNumericFieldOrder_NoDefaults()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false));
-            var message = new TestJsonFieldOrdering { PlainString = "p1", PlainInt32 = 2 };
-            AssertJson("{ 'plainString': 'p1', 'plainInt32': 2 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1Int32 = 5, O2String = "o2", PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o2String': 'o2', 'plainInt32': 10, 'o1Int32': 5 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1String = "", O2Int32 = 0, PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o1String': '', 'plainInt32': 10, 'o2Int32': 0 }", formatter.Format(message));
-        }
-
-        [Test]
-        public void OutputIsInNumericFieldOrder_WithDefaults()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(true));
-            var message = new TestJsonFieldOrdering();
-            AssertJson("{ 'plainString': '', 'plainInt32': 0 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1Int32 = 5, O2String = "o2", PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o2String': 'o2', 'plainInt32': 10, 'o1Int32': 5 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1String = "", O2Int32 = 0, PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o1String': '', 'plainInt32': 10, 'o2Int32': 0 }", formatter.Format(message));
-        }
-
-        [Test]
-        [TestCase("1970-01-01T00:00:00Z", 0)]
-        [TestCase("1970-01-01T00:00:00.000000001Z", 1)]
-        [TestCase("1970-01-01T00:00:00.000000010Z", 10)]
-        [TestCase("1970-01-01T00:00:00.000000100Z", 100)]
-        [TestCase("1970-01-01T00:00:00.000001Z", 1000)]
-        [TestCase("1970-01-01T00:00:00.000010Z", 10000)]
-        [TestCase("1970-01-01T00:00:00.000100Z", 100000)]
-        [TestCase("1970-01-01T00:00:00.001Z", 1000000)]
-        [TestCase("1970-01-01T00:00:00.010Z", 10000000)]
-        [TestCase("1970-01-01T00:00:00.100Z", 100000000)]
-        [TestCase("1970-01-01T00:00:00.120Z", 120000000)]
-        [TestCase("1970-01-01T00:00:00.123Z", 123000000)]
-        [TestCase("1970-01-01T00:00:00.123400Z", 123400000)]
-        [TestCase("1970-01-01T00:00:00.123450Z", 123450000)]
-        [TestCase("1970-01-01T00:00:00.123456Z", 123456000)]
-        [TestCase("1970-01-01T00:00:00.123456700Z", 123456700)]
-        [TestCase("1970-01-01T00:00:00.123456780Z", 123456780)]
-        [TestCase("1970-01-01T00:00:00.123456789Z", 123456789)]
-        public void TimestampStandalone(string expected, int nanos)
-        {
-            Assert.AreEqual(WrapInQuotes(expected), new Timestamp { Nanos = nanos }.ToString());
-        }
-
-        [Test]
-        public void TimestampStandalone_FromDateTime()
-        {
-            // One before and one after the Unix epoch, more easily represented via DateTime.
-            Assert.AreEqual("\"1673-06-19T12:34:56Z\"",
-                new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp().ToString());
-            Assert.AreEqual("\"2015-07-31T10:29:34Z\"",
-                new DateTime(2015, 7, 31, 10, 29, 34, DateTimeKind.Utc).ToTimestamp().ToString());
-        }
-
-        [Test]
-        [TestCase(-1, -1)] // Would be valid as duration
-        [TestCase(1, Timestamp.MaxNanos + 1)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue + 1, 0)]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue - 1, 0)]
-        public void TimestampStandalone_NonNormalized(long seconds, int nanoseconds)
-        {
-            var timestamp = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(timestamp));
-        }
-
-        [Test]
-        public void TimestampField()
-        {
-            var message = new TestWellKnownTypes { TimestampField = new Timestamp() };
-            AssertJson("{ 'timestampField': '1970-01-01T00:00:00Z' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase(0, 0, "0s")]
-        [TestCase(1, 0, "1s")]
-        [TestCase(-1, 0, "-1s")]
-        [TestCase(0, 1, "0.000000001s")]
-        [TestCase(0, 10, "0.000000010s")]
-        [TestCase(0, 100, "0.000000100s")]
-        [TestCase(0, 1000, "0.000001s")]
-        [TestCase(0, 10000, "0.000010s")]
-        [TestCase(0, 100000, "0.000100s")]
-        [TestCase(0, 1000000, "0.001s")]
-        [TestCase(0, 10000000, "0.010s")]
-        [TestCase(0, 100000000, "0.100s")]
-        [TestCase(0, 120000000, "0.120s")]
-        [TestCase(0, 123000000, "0.123s")]
-        [TestCase(0, 123400000, "0.123400s")]
-        [TestCase(0, 123450000, "0.123450s")]
-        [TestCase(0, 123456000, "0.123456s")]
-        [TestCase(0, 123456700, "0.123456700s")]
-        [TestCase(0, 123456780, "0.123456780s")]
-        [TestCase(0, 123456789, "0.123456789s")]
-        [TestCase(0, -100000000, "-0.100s")]
-        [TestCase(1, 100000000, "1.100s")]
-        [TestCase(-1, -100000000, "-1.100s")]
-        public void DurationStandalone(long seconds, int nanoseconds, string expected)
-        {
-            var json = JsonFormatter.Default.Format(new Duration { Seconds = seconds, Nanos = nanoseconds });
-            Assert.AreEqual(WrapInQuotes(expected), json);
-        }
-
-        [Test]
-        [TestCase(1, 2123456789)]
-        [TestCase(1, -100000000)]
-        public void DurationStandalone_NonNormalized(long seconds, int nanoseconds)
-        {
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(duration));
-        }
-
-        [Test]
-        public void DurationField()
-        {
-            var message = new TestWellKnownTypes { DurationField = new Duration() };
-            AssertJson("{ 'durationField': '0s' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void StructSample()
-        {
-            var message = new Struct
-            {
-                Fields =
-                {
-                    { "a", Value.ForNull() },
-                    { "b", Value.ForBool(false) },
-                    { "c", Value.ForNumber(10.5) },
-                    { "d", Value.ForString("text") },
-                    { "e", Value.ForList(Value.ForString("t1"), Value.ForNumber(5)) },
-                    { "f", Value.ForStruct(new Struct { Fields = { { "nested", Value.ForString("value") } } }) }
-                }
-            };
-            AssertJson("{ 'a': null, 'b': false, 'c': 10.5, 'd': 'text', 'e': [ 't1', 5 ], 'f': { 'nested': 'value' } }", message.ToString());
-        }
-
-        [Test]
-        [TestCase("foo__bar")]
-        [TestCase("foo_3_ar")]
-        [TestCase("fooBar")]
-        public void FieldMaskInvalid(string input)
-        {
-            var mask = new FieldMask { Paths = { input } };
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(mask));
-        }
-
-        [Test]
-        public void FieldMaskStandalone()
-        {
-            var fieldMask = new FieldMask { Paths = { "", "single", "with_underscore", "nested.field.name", "nested..double_dot" } };
-            Assert.AreEqual("\",single,withUnderscore,nested.field.name,nested..doubleDot\"", fieldMask.ToString());
-
-            // Invalid, but we shouldn't create broken JSON...
-            fieldMask = new FieldMask { Paths = { "x\\y" } };
-            Assert.AreEqual(@"""x\\y""", fieldMask.ToString());
-        }
-
-        [Test]
-        public void FieldMaskField()
-        {
-            var message = new TestWellKnownTypes { FieldMaskField = new FieldMask { Paths = { "user.display_name", "photo" } } };
-            AssertJson("{ 'fieldMaskField': 'user.displayName,photo' }", JsonFormatter.Default.Format(message));
-        }
-
-        // SourceContext is an example of a well-known type with no special JSON handling
-        [Test]
-        public void SourceContextStandalone()
-        {
-            var message = new SourceContext { FileName = "foo.proto" };
-            AssertJson("{ 'fileName': 'foo.proto' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void AnyWellKnownType()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, TypeRegistry.FromMessages(Timestamp.Descriptor)));
-            var timestamp = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            var any = Any.Pack(timestamp);
-            AssertJson("{ '@type': 'type.googleapis.com/google.protobuf.Timestamp', 'value': '1673-06-19T12:34:56Z' }", formatter.Format(any));
-        }
-
-        [Test]
-        public void AnyMessageType()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 } };
-            var any = Any.Pack(message);
-            AssertJson("{ '@type': 'type.googleapis.com/protobuf_unittest.TestAllTypes', 'singleInt32': 10, 'singleNestedMessage': { 'bb': 20 } }", formatter.Format(any));
-        }
-
-        [Test]
-        public void AnyMessageType_CustomPrefix()
-        {
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10 };
-            var any = Any.Pack(message, "foo.bar/baz");
-            AssertJson("{ '@type': 'foo.bar/baz/protobuf_unittest.TestAllTypes', 'singleInt32': 10 }", formatter.Format(any));
-        }
-
-        [Test]
-        public void AnyNested()
-        {
-            var registry = TypeRegistry.FromMessages(TestWellKnownTypes.Descriptor, TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-
-            // Nest an Any as the value of an Any.
-            var doubleNestedMessage = new TestAllTypes { SingleInt32 = 20 };
-            var nestedMessage = Any.Pack(doubleNestedMessage);
-            var message = new TestWellKnownTypes { AnyField = Any.Pack(nestedMessage) };
-            AssertJson("{ 'anyField': { '@type': 'type.googleapis.com/google.protobuf.Any', 'value': { '@type': 'type.googleapis.com/protobuf_unittest.TestAllTypes', 'singleInt32': 20 } } }",
-                formatter.Format(message));
-        }
-
-        [Test]
-        public void AnyUnknownType()
-        {
-            // The default type registry doesn't have any types in it.
-            var message = new TestAllTypes();
-            var any = Any.Pack(message);
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(any));
-        }
-
-        [Test]
-        [TestCase(typeof(BoolValue), true, "true")]
-        [TestCase(typeof(Int32Value), 32, "32")]
-        [TestCase(typeof(Int64Value), 32L, "\"32\"")]
-        [TestCase(typeof(UInt32Value), 32U, "32")]
-        [TestCase(typeof(UInt64Value), 32UL, "\"32\"")]
-        [TestCase(typeof(StringValue), "foo", "\"foo\"")]
-        [TestCase(typeof(FloatValue), 1.5f, "1.5")]
-        [TestCase(typeof(DoubleValue), 1.5d, "1.5")]
-        public void Wrappers_Standalone(System.Type wrapperType, object value, string expectedJson)
-        {
-            IMessage populated = (IMessage)Activator.CreateInstance(wrapperType);
-            populated.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.SetValue(populated, value);
-            Assert.AreEqual(expectedJson, JsonFormatter.Default.Format(populated));
-        }
-
-        // Sanity tests for WriteValue. Not particularly comprehensive, as it's all covered above already,
-        // as FormatMessage uses WriteValue.
-
-        [TestCase(null, "null")]
-        [TestCase(1, "1")]
-        [TestCase(1L, "'1'")]
-        [TestCase(0.5f, "0.5")]
-        [TestCase(0.5d, "0.5")]
-        [TestCase("text", "'text'")]
-        [TestCase("x\ny", @"'x\ny'")]
-        [TestCase(ForeignEnum.ForeignBar, "'FOREIGN_BAR'")]
-        public void WriteValue_Constant(object value, string expectedJson)
-        {
-            AssertWriteValue(value, expectedJson);
-        }
-
-        [Test]
-        public void WriteValue_Timestamp()
-        {
-            var value = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            AssertWriteValue(value, "'1673-06-19T12:34:56Z'");
-        }
-
-        [Test]
-        public void WriteValue_Message()
-        {
-            var value = new TestAllTypes { SingleInt32 = 100, SingleInt64 = 3210987654321L };
-            AssertWriteValue(value, "{ 'singleInt32': 100, 'singleInt64': '3210987654321' }");
-        }
-
-        [Test]
-        public void WriteValue_List()
-        {
-            var value = new RepeatedField<int> { 1, 2, 3 };
-            AssertWriteValue(value, "[ 1, 2, 3 ]");
-        }
-
-        private static void AssertWriteValue(object value, string expectedJson)
-        {
-            var writer = new StringWriter();
-            JsonFormatter.Default.WriteValue(writer, value);
-            string actual = writer.ToString();
-            AssertJson(expectedJson, actual);
-        }
-
-        /// <summary>
-        /// Checks that the actual JSON is the same as the expected JSON - but after replacing
-        /// all apostrophes in the expected JSON with double quotes. This basically makes the tests easier
-        /// to read.
-        /// </summary>
-        private static void AssertJson(string expectedJsonWithApostrophes, string actualJson)
-        {
-            var expectedJson = expectedJsonWithApostrophes.Replace("'", "\"");
-            Assert.AreEqual(expectedJson, actualJson);
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/JsonParserTest.cs

@@ -1,939 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Unit tests for JSON parsing.
-    /// </summary>
-    public class JsonParserTest
-    {
-        // Sanity smoke test
-        [Test]
-        public void AllTypesRoundtrip()
-        {
-            AssertRoundtrip(SampleMessages.CreateFullTestAllTypes());
-        }
-
-        [Test]
-        public void Maps()
-        {
-            AssertRoundtrip(new TestMap { MapStringString = { { "with spaces", "bar" }, { "a", "b" } } });
-            AssertRoundtrip(new TestMap { MapInt32Int32 = { { 0, 1 }, { 2, 3 } } });
-            AssertRoundtrip(new TestMap { MapBoolBool = { { false, true }, { true, false } } });
-        }
-
-        [Test]
-        [TestCase(" 1 ")]
-        [TestCase("+1")]
-        [TestCase("1,000")]
-        [TestCase("1.5")]
-        public void IntegerMapKeysAreStrict(string keyText)
-        {
-            // Test that integer parsing is strict. We assume that if this is correct for int32,
-            // it's correct for other numeric key types.
-            var json = "{ \"mapInt32Int32\": { \"" + keyText + "\" : \"1\" } }";
-            Assert.Throws<InvalidProtocolBufferException>(() => JsonParser.Default.Parse<TestMap>(json));
-        }
-
-        [Test]
-        public void OriginalFieldNameAccepted()
-        {
-            var json = "{ \"single_int32\": 10 }";
-            var expected = new TestAllTypes { SingleInt32 = 10 };
-            Assert.AreEqual(expected, TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void SourceContextRoundtrip()
-        {
-            AssertRoundtrip(new SourceContext { FileName = "foo.proto" });
-        }
-
-        [Test]
-        public void SingularWrappers_DefaultNonNullValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void SingularWrappers_NonDefaultValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void SingularWrappers_ExplicitNulls()
-        {
-            // When we parse the "valueField": null part, we remember it... basically, it's one case
-            // where explicit default values don't fully roundtrip.
-            var message = new TestWellKnownTypes { ValueField = Value.ForNull() };
-            var json = new JsonFormatter(new JsonFormatter.Settings(true)).Format(message);
-            var parsed = JsonParser.Default.Parse<TestWellKnownTypes>(json);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        [TestCase(typeof(BoolValue), "true", true)]
-        [TestCase(typeof(Int32Value), "32", 32)]
-        [TestCase(typeof(Int64Value), "32", 32L)]
-        [TestCase(typeof(Int64Value), "\"32\"", 32L)]
-        [TestCase(typeof(UInt32Value), "32", 32U)]
-        [TestCase(typeof(UInt64Value), "\"32\"", 32UL)]
-        [TestCase(typeof(UInt64Value), "32", 32UL)]
-        [TestCase(typeof(StringValue), "\"foo\"", "foo")]
-        [TestCase(typeof(FloatValue), "1.5", 1.5f)]
-        [TestCase(typeof(DoubleValue), "1.5", 1.5d)]
-        public void Wrappers_Standalone(System.Type wrapperType, string json, object expectedValue)
-        {
-            IMessage parsed = (IMessage)Activator.CreateInstance(wrapperType);
-            IMessage expected = (IMessage)Activator.CreateInstance(wrapperType);
-            JsonParser.Default.Merge(parsed, "null");
-            Assert.AreEqual(expected, parsed);
-
-            JsonParser.Default.Merge(parsed, json);
-            expected.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.SetValue(expected, expectedValue);
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void ExplicitNullValue()
-        {
-            string json = "{\"valueField\": null}";
-            var message = JsonParser.Default.Parse<TestWellKnownTypes>(json);
-            Assert.AreEqual(new TestWellKnownTypes { ValueField = Value.ForNull() }, message);
-        }
-
-        [Test]
-        public void BytesWrapper_Standalone()
-        {
-            ByteString data = ByteString.CopyFrom(1, 2, 3);
-            // Can't do this with attributes...
-            var parsed = JsonParser.Default.Parse<BytesValue>(WrapInQuotes(data.ToBase64()));
-            var expected = new BytesValue { Value = data };
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void RepeatedWrappers()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void RepeatedField_NullElementProhibited()
-        {
-            string json = "{ \"repeated_foreign_message\": [null] }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void RepeatedField_NullOverallValueAllowed()
-        {
-            string json = "{ \"repeated_foreign_message\": null }";
-            Assert.AreEqual(new TestAllTypes(), TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("{ \"mapInt32Int32\": { \"10\": null }")]
-        [TestCase("{ \"mapStringString\": { \"abc\": null }")]
-        [TestCase("{ \"mapInt32ForeignMessage\": { \"10\": null }")]
-        public void MapField_NullValueProhibited(string json)
-        {
-            Assert.Throws<InvalidProtocolBufferException>(() => TestMap.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void MapField_NullOverallValueAllowed()
-        {
-            string json = "{ \"mapInt32Int32\": null }";
-            Assert.AreEqual(new TestMap(), TestMap.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void IndividualWrapperTypes()
-        {
-            Assert.AreEqual(new StringValue { Value = "foo" }, StringValue.Parser.ParseJson("\"foo\""));
-            Assert.AreEqual(new Int32Value { Value = 1 }, Int32Value.Parser.ParseJson("1"));
-            // Can parse strings directly too
-            Assert.AreEqual(new Int32Value { Value = 1 }, Int32Value.Parser.ParseJson("\"1\""));
-        }
-
-        private static void AssertRoundtrip<T>(T message) where T : IMessage<T>, new()
-        {
-            var clone = message.Clone();
-            var json = JsonFormatter.Default.Format(message);
-            var parsed = JsonParser.Default.Parse<T>(json);
-            Assert.AreEqual(clone, parsed);
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // Not entirely clear whether we intend to allow this...
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        [TestCase("2147483647", 2147483647)]
-        [TestCase("-2147483648", -2147483648)]
-        public void StringToInt32_Valid(string jsonValue, int expectedParsedValue)
-        {
-            string json = "{ \"singleInt32\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt32);
-        }
-
-        [Test]
-        [TestCase("+0")]
-        [TestCase(" 1")]
-        [TestCase("1 ")]
-        [TestCase("00")]
-        [TestCase("-00")]
-        [TestCase("--1")]
-        [TestCase("+1")]
-        [TestCase("1.5")]
-        [TestCase("1e10")]
-        [TestCase("2147483648")]
-        [TestCase("-2147483649")]
-        public void StringToInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt32\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0U)]
-        [TestCase("1", 1U)]
-        [TestCase("4294967295", 4294967295U)]
-        public void StringToUInt32_Valid(string jsonValue, uint expectedParsedValue)
-        {
-            string json = "{ \"singleUint32\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint32);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("4294967296")]
-        public void StringToUInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint32\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0L)]
-        [TestCase("1", 1L)]
-        [TestCase("-1", -1L)]
-        [TestCase("9223372036854775807", 9223372036854775807)]
-        [TestCase("-9223372036854775808", -9223372036854775808)]
-        public void StringToInt64_Valid(string jsonValue, long expectedParsedValue)
-        {
-            string json = "{ \"singleInt64\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-9223372036854775809")]
-        [TestCase("9223372036854775808")]
-        public void StringToInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt64\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0UL)]
-        [TestCase("1", 1UL)]
-        [TestCase("18446744073709551615", 18446744073709551615)]
-        public void StringToUInt64_Valid(string jsonValue, ulong expectedParsedValue)
-        {
-            string json = "{ \"singleUint64\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("18446744073709551616")]
-        public void StringToUInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint64\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0d)]
-        [TestCase("1", 1d)]
-        [TestCase("1.000000", 1d)]
-        [TestCase("1.0000000000000000000000001", 1d)] // We don't notice that we haven't preserved the exact value
-        [TestCase("-1", -1d)]
-        [TestCase("1e1", 10d)]
-        [TestCase("1e01", 10d)] // Leading decimals are allowed in exponents
-        [TestCase("1E1", 10d)] // Either case is fine
-        [TestCase("-1e1", -10d)]
-        [TestCase("1.5e1", 15d)]
-        [TestCase("-1.5e1", -15d)]
-        [TestCase("15e-1", 1.5d)]
-        [TestCase("-15e-1", -1.5d)]
-        [TestCase("1.79769e308", 1.79769e308)]
-        [TestCase("-1.79769e308", -1.79769e308)]
-        [TestCase("Infinity", double.PositiveInfinity)]
-        [TestCase("-Infinity", double.NegativeInfinity)]
-        [TestCase("NaN", double.NaN)]
-        public void StringToDouble_Valid(string jsonValue, double expectedParsedValue)
-        {
-            string json = "{ \"singleDouble\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleDouble);
-        }
-
-        [Test]
-        [TestCase("1.7977e308")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1e309")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("01")]
-        [TestCase("-00")]
-        [TestCase("-01")]
-        [TestCase("--1")]
-        [TestCase(" Infinity")]
-        [TestCase(" -Infinity")]
-        [TestCase("NaN ")]
-        [TestCase("Infinity ")]
-        [TestCase("-Infinity ")]
-        [TestCase(" NaN")]
-        [TestCase("INFINITY")]
-        [TestCase("nan")]
-        [TestCase("\u00BD")] // 1/2 as a single Unicode character. Just sanity checking...
-        public void StringToDouble_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleDouble\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0f)]
-        [TestCase("1", 1f)]
-        [TestCase("1.000000", 1f)]
-        [TestCase("-1", -1f)]
-        [TestCase("3.402823e38", 3.402823e38f)]
-        [TestCase("-3.402823e38", -3.402823e38f)]
-        [TestCase("1.5e1", 15f)]
-        [TestCase("15e-1", 1.5f)]
-        public void StringToFloat_Valid(string jsonValue, float expectedParsedValue)
-        {
-            string json = "{ \"singleFloat\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleFloat);
-        }
-
-        [Test]
-        [TestCase("3.402824e38")]
-        [TestCase("-3.402824e38")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("--1")]
-        public void StringToFloat_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleFloat\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // Not entirely clear whether we intend to allow this...
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        [TestCase("2147483647", 2147483647)]
-        [TestCase("-2147483648", -2147483648)]
-        [TestCase("1e1", 10)]
-        [TestCase("-1e1", -10)]
-        [TestCase("10.00", 10)]
-        [TestCase("-10.00", -10)]
-        public void NumberToInt32_Valid(string jsonValue, int expectedParsedValue)
-        {
-            string json = "{ \"singleInt32\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt32);
-        }
-
-        [Test]
-        [TestCase("+0", typeof(InvalidJsonException))]
-        [TestCase("00", typeof(InvalidJsonException))]
-        [TestCase("-00", typeof(InvalidJsonException))]
-        [TestCase("--1", typeof(InvalidJsonException))]
-        [TestCase("+1", typeof(InvalidJsonException))]
-        [TestCase("1.5", typeof(InvalidProtocolBufferException))]
-        // Value is out of range
-        [TestCase("1e10", typeof(InvalidProtocolBufferException))]
-        [TestCase("2147483648", typeof(InvalidProtocolBufferException))]
-        [TestCase("-2147483649", typeof(InvalidProtocolBufferException))]
-        public void NumberToInt32_Invalid(string jsonValue, System.Type expectedExceptionType)
-        {
-            string json = "{ \"singleInt32\": " + jsonValue + "}";
-            Assert.Throws(expectedExceptionType, () => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0U)]
-        [TestCase("1", 1U)]
-        [TestCase("4294967295", 4294967295U)]
-        public void NumberToUInt32_Valid(string jsonValue, uint expectedParsedValue)
-        {
-            string json = "{ \"singleUint32\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint32);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("4294967296")]
-        public void NumberToUInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint32\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0L)]
-        [TestCase("1", 1L)]
-        [TestCase("-1", -1L)]
-        // long.MaxValue isn't actually representable as a double. This string value is the highest
-        // representable value which isn't greater than long.MaxValue.
-        [TestCase("9223372036854774784", 9223372036854774784)]
-        [TestCase("-9223372036854775808", -9223372036854775808)]
-        public void NumberToInt64_Valid(string jsonValue, long expectedParsedValue)
-        {
-            string json = "{ \"singleInt64\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("9223372036854775808")]
-        // Theoretical bound would be -9223372036854775809, but when that is parsed to a double
-        // we end up with the exact value of long.MinValue due to lack of precision. The value here
-        // is the "next double down".
-        [TestCase("-9223372036854780000")]
-        public void NumberToInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt64\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0UL)]
-        [TestCase("1", 1UL)]
-        // ulong.MaxValue isn't representable as a double. This value is the largest double within
-        // the range of ulong.
-        [TestCase("18446744073709549568", 18446744073709549568UL)]
-        public void NumberToUInt64_Valid(string jsonValue, ulong expectedParsedValue)
-        {
-            string json = "{ \"singleUint64\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("18446744073709551616")]
-        public void NumberToUInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint64\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0d)]
-        [TestCase("1", 1d)]
-        [TestCase("1.000000", 1d)]
-        [TestCase("1.0000000000000000000000001", 1d)] // We don't notice that we haven't preserved the exact value
-        [TestCase("-1", -1d)]
-        [TestCase("1e1", 10d)]
-        [TestCase("1e01", 10d)] // Leading decimals are allowed in exponents
-        [TestCase("1E1", 10d)] // Either case is fine
-        [TestCase("-1e1", -10d)]
-        [TestCase("1.5e1", 15d)]
-        [TestCase("-1.5e1", -15d)]
-        [TestCase("15e-1", 1.5d)]
-        [TestCase("-15e-1", -1.5d)]
-        [TestCase("1.79769e308", 1.79769e308)]
-        [TestCase("-1.79769e308", -1.79769e308)]
-        public void NumberToDouble_Valid(string jsonValue, double expectedParsedValue)
-        {
-            string json = "{ \"singleDouble\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleDouble);
-        }
-
-        [Test]
-        [TestCase("1.7977e308")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1e309")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("--1")]
-        [TestCase("\u00BD")] // 1/2 as a single Unicode character. Just sanity checking...
-        public void NumberToDouble_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleDouble\": " + jsonValue + "}";
-            Assert.Throws<InvalidJsonException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0f)]
-        [TestCase("1", 1f)]
-        [TestCase("1.000000", 1f)]
-        [TestCase("-1", -1f)]
-        [TestCase("3.402823e38", 3.402823e38f)]
-        [TestCase("-3.402823e38", -3.402823e38f)]
-        [TestCase("1.5e1", 15f)]
-        [TestCase("15e-1", 1.5f)]
-        public void NumberToFloat_Valid(string jsonValue, float expectedParsedValue)
-        {
-            string json = "{ \"singleFloat\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleFloat);
-        }
-
-        [Test]
-        [TestCase("3.402824e38", typeof(InvalidProtocolBufferException))]
-        [TestCase("-3.402824e38", typeof(InvalidProtocolBufferException))]
-        [TestCase("1,0", typeof(InvalidJsonException))]
-        [TestCase("1.0.0", typeof(InvalidJsonException))]
-        [TestCase("+1", typeof(InvalidJsonException))]
-        [TestCase("00", typeof(InvalidJsonException))]
-        [TestCase("--1", typeof(InvalidJsonException))]
-        public void NumberToFloat_Invalid(string jsonValue, System.Type expectedExceptionType)
-        {
-            string json = "{ \"singleFloat\": " + jsonValue + "}";
-            Assert.Throws(expectedExceptionType, () => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        // The simplest way of testing that the value has parsed correctly is to reformat it,
-        // as we trust the formatting. In many cases that will give the same result as the input,
-        // so in those cases we accept an expectedFormatted value of null. Sometimes the results
-        // will be different though, due to a different number of digits being provided.
-        [Test]
-        // Z offset
-        [TestCase("2015-10-09T14:46:23.123456789Z", null)]
-        [TestCase("2015-10-09T14:46:23.123456Z", null)]
-        [TestCase("2015-10-09T14:46:23.123Z", null)]
-        [TestCase("2015-10-09T14:46:23Z", null)]
-        [TestCase("2015-10-09T14:46:23.123456000Z", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.1234560Z", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123000000Z", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.1230Z", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.00Z", "2015-10-09T14:46:23Z")]
-
-        // +00:00 offset
-        [TestCase("2015-10-09T14:46:23.123456789+00:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T14:46:23.123456+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23+00:00", "2015-10-09T14:46:23Z")]
-        [TestCase("2015-10-09T14:46:23.123456000+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.1234560+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123000000+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.1230+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.00+00:00", "2015-10-09T14:46:23Z")]
-
-        // Other offsets (assume by now that the subsecond handling is okay)
-        [TestCase("2015-10-09T15:46:23.123456789+01:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T13:46:23.123456789-01:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T15:16:23.123456789+00:30", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T14:16:23.123456789-00:30", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T16:31:23.123456789+01:45", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T13:01:23.123456789-01:45", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-10T08:46:23.123456789+18:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-08T20:46:23.123456789-18:00", "2015-10-09T14:46:23.123456789Z")]
-
-        // Leap years and min/max
-        [TestCase("2016-02-29T14:46:23.123456789Z", null)]
-        [TestCase("2000-02-29T14:46:23.123456789Z", null)]
-        [TestCase("0001-01-01T00:00:00Z", null)]
-        [TestCase("9999-12-31T23:59:59.999999999Z", null)]
-        public void Timestamp_Valid(string jsonValue, string expectedFormatted)
-        {
-            expectedFormatted = expectedFormatted ?? jsonValue;
-            string json = WrapInQuotes(jsonValue);
-            var parsed = Timestamp.Parser.ParseJson(json);
-            Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
-        }
-
-        [Test]
-        [TestCase("2015-10-09 14:46:23.123456789Z", Description = "No T between date and time")]
-        [TestCase("2015/10/09T14:46:23.123456789Z", Description = "Wrong date separators")]
-        [TestCase("2015-10-09T14.46.23.123456789Z", Description = "Wrong time separators")]
-        [TestCase("2015-10-09T14:46:23,123456789Z", Description = "Wrong fractional second separators (valid ISO-8601 though)")]
-        [TestCase(" 2015-10-09T14:46:23.123456789Z", Description = "Whitespace at start")]
-        [TestCase("2015-10-09T14:46:23.123456789Z ", Description = "Whitespace at end")]
-        [TestCase("2015-10-09T14:46:23.1234567890", Description = "Too many digits")]
-        [TestCase("2015-10-09T14:46:23.123456789", Description = "No offset")]
-        [TestCase("2015-13-09T14:46:23.123456789Z", Description = "Invalid month")]
-        [TestCase("2015-10-32T14:46:23.123456789Z", Description = "Invalid day")]
-        [TestCase("2015-10-09T24:00:00.000000000Z", Description = "Invalid hour (valid ISO-8601 though)")]
-        [TestCase("2015-10-09T14:60:23.123456789Z", Description = "Invalid minutes")]
-        [TestCase("2015-10-09T14:46:60.123456789Z", Description = "Invalid seconds")]
-        [TestCase("2015-10-09T14:46:23.123456789+18:01", Description = "Offset too large (positive)")]
-        [TestCase("2015-10-09T14:46:23.123456789-18:01", Description = "Offset too large (negative)")]
-        [TestCase("2015-10-09T14:46:23.123456789-00:00", Description = "Local offset (-00:00) makes no sense here")]
-        [TestCase("0001-01-01T00:00:00+00:01", Description = "Value before earliest when offset applied")]
-        [TestCase("9999-12-31T23:59:59.999999999-00:01", Description = "Value after latest when offset applied")]
-        [TestCase("2100-02-29T14:46:23.123456789Z", Description = "Feb 29th on a non-leap-year")]
-        public void Timestamp_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => Timestamp.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void StructValue_Null()
-        {
-            Assert.AreEqual(new Value { NullValue = 0 }, Value.Parser.ParseJson("null"));
-        }
-
-        [Test]
-        public void StructValue_String()
-        {
-            Assert.AreEqual(new Value { StringValue = "hi" }, Value.Parser.ParseJson("\"hi\""));
-        }
-
-        [Test]
-        public void StructValue_Bool()
-        {
-            Assert.AreEqual(new Value { BoolValue = true }, Value.Parser.ParseJson("true"));
-            Assert.AreEqual(new Value { BoolValue = false }, Value.Parser.ParseJson("false"));
-        }
-
-        [Test]
-        public void StructValue_List()
-        {
-            Assert.AreEqual(Value.ForList(Value.ForNumber(1), Value.ForString("x")), Value.Parser.ParseJson("[1, \"x\"]"));
-        }
-
-        [Test]
-        public void ParseListValue()
-        {
-            Assert.AreEqual(new ListValue { Values = { Value.ForNumber(1), Value.ForString("x") } }, ListValue.Parser.ParseJson("[1, \"x\"]"));
-        }
-
-        [Test]
-        public void StructValue_Struct()
-        {
-            Assert.AreEqual(
-                Value.ForStruct(new Struct { Fields = { { "x", Value.ForNumber(1) }, { "y", Value.ForString("z") } } }),
-                Value.Parser.ParseJson("{ \"x\": 1, \"y\": \"z\" }"));
-        }
-
-        [Test]
-        public void ParseStruct()
-        {
-            Assert.AreEqual(new Struct { Fields = { { "x", Value.ForNumber(1) }, { "y", Value.ForString("z") } } },
-                Struct.Parser.ParseJson("{ \"x\": 1, \"y\": \"z\" }"));
-        }
-
-        // TODO for duration parsing: upper and lower bounds.
-        // +/- 315576000000 seconds
-
-        [Test]
-        [TestCase("1.123456789s", null)]
-        [TestCase("1.123456s", null)]
-        [TestCase("1.123s", null)]
-        [TestCase("1.12300s", "1.123s")]
-        [TestCase("1.12345s", "1.123450s")]
-        [TestCase("1s", null)]
-        [TestCase("-1.123456789s", null)]
-        [TestCase("-1.123456s", null)]
-        [TestCase("-1.123s", null)]
-        [TestCase("-1s", null)]
-        [TestCase("0.123s", null)]
-        [TestCase("-0.123s", null)]
-        [TestCase("123456.123s", null)]
-        [TestCase("-123456.123s", null)]
-        // Upper and lower bounds
-        [TestCase("315576000000s", null)]
-        [TestCase("-315576000000s", null)]
-        public void Duration_Valid(string jsonValue, string expectedFormatted)
-        {
-            expectedFormatted = expectedFormatted ?? jsonValue;
-            string json = WrapInQuotes(jsonValue);
-            var parsed = Duration.Parser.ParseJson(json);
-            Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
-        }
-
-        // The simplest way of testing that the value has parsed correctly is to reformat it,
-        // as we trust the formatting. In many cases that will give the same result as the input,
-        // so in those cases we accept an expectedFormatted value of null. Sometimes the results
-        // will be different though, due to a different number of digits being provided.
-        [Test]
-        [TestCase("1.1234567890s", Description = "Too many digits")]
-        [TestCase("1.123456789", Description = "No suffix")]
-        [TestCase("1.123456789ss", Description = "Too much suffix")]
-        [TestCase("1.123456789S", Description = "Upper case suffix")]
-        [TestCase("+1.123456789s", Description = "Leading +")]
-        [TestCase(".123456789s", Description = "No integer before the fraction")]
-        [TestCase("1,123456789s", Description = "Comma as decimal separator")]
-        [TestCase("1x1.123456789s", Description = "Non-digit in integer part")]
-        [TestCase("1.1x3456789s", Description = "Non-digit in fractional part")]
-        [TestCase(" 1.123456789s", Description = "Whitespace before fraction")]
-        [TestCase("1.123456789s ", Description = "Whitespace after value")]
-        [TestCase("01.123456789s", Description = "Leading zero (positive)")]
-        [TestCase("-01.123456789s", Description = "Leading zero (negative)")]
-        [TestCase("--0.123456789s", Description = "Double minus sign")]
-        // Violate upper/lower bounds in various ways
-        [TestCase("315576000001s", Description = "Integer part too large")]
-        [TestCase("3155760000000s", Description = "Integer part too long (positive)")]
-        [TestCase("-3155760000000s", Description = "Integer part too long (negative)")]
-        public void Duration_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => Duration.Parser.ParseJson(json));
-        }
-
-        // Not as many tests for field masks as I'd like; more to be added when we have more
-        // detailed specifications.
-
-        [Test]
-        [TestCase("")]
-        [TestCase("foo", "foo")]
-        [TestCase("foo,bar", "foo", "bar")]
-        [TestCase("foo.bar", "foo.bar")]
-        [TestCase("fooBar", "foo_bar")]
-        [TestCase("fooBar.bazQux", "foo_bar.baz_qux")]
-        public void FieldMask_Valid(string jsonValue, params string[] expectedPaths)
-        {
-            string json = WrapInQuotes(jsonValue);
-            var parsed = FieldMask.Parser.ParseJson(json);
-            CollectionAssert.AreEqual(expectedPaths, parsed.Paths);
-        }
-
-        [Test]
-        [TestCase("foo_bar")]
-        public void FieldMask_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => FieldMask.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_RegularMessage()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 } };
-            var original = Any.Pack(message);
-            var json = formatter.Format(original); // This is tested in JsonFormatterTest
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-            string valueFirstJson = "{ \"singleInt32\": 10, \"singleNestedMessage\": { \"bb\": 20 }, \"@type\": \"type.googleapis.com/protobuf_unittest.TestAllTypes\" }";
-            Assert.AreEqual(original, parser.Parse<Any>(valueFirstJson));
-        }
-
-        [Test]
-        public void Any_CustomPrefix()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            var message = new TestAllTypes { SingleInt32 = 10 };
-            var original = Any.Pack(message, "custom.prefix/middle-part");
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            string json = "{ \"@type\": \"custom.prefix/middle-part/protobuf_unittest.TestAllTypes\", \"singleInt32\": 10 }";
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-        }
-
-        [Test]
-        public void Any_UnknownType()
-        {
-            string json = "{ \"@type\": \"type.googleapis.com/bogus\" }";
-            Assert.Throws<InvalidOperationException>(() => Any.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_NoTypeUrl()
-        {
-            string json = "{ \"foo\": \"bar\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => Any.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_WellKnownType()
-        {
-            var registry = TypeRegistry.FromMessages(Timestamp.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-            var timestamp = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            var original = Any.Pack(timestamp);
-            var json = formatter.Format(original); // This is tested in JsonFormatterTest
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-            string valueFirstJson = "{ \"value\": \"1673-06-19T12:34:56Z\", \"@type\": \"type.googleapis.com/google.protobuf.Timestamp\" }";
-            Assert.AreEqual(original, parser.Parse<Any>(valueFirstJson));
-        }
-
-        [Test]
-        public void Any_Nested()
-        {
-            var registry = TypeRegistry.FromMessages(TestWellKnownTypes.Descriptor, TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            var doubleNestedMessage = new TestAllTypes { SingleInt32 = 20 };
-            var nestedMessage = Any.Pack(doubleNestedMessage);
-            var message = new TestWellKnownTypes { AnyField = Any.Pack(nestedMessage) };
-            var json = formatter.Format(message);
-            // Use the descriptor-based parser just for a change.
-            Assert.AreEqual(message, parser.Parse(json, TestWellKnownTypes.Descriptor));
-        }
-
-        [Test]
-        public void DataAfterObject()
-        {
-            string json = "{} 10";
-            Assert.Throws<InvalidJsonException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        /// <summary>
-        /// JSON equivalent to <see cref="CodedInputStreamTest.MaliciousRecursion"/>
-        /// </summary>
-        [Test]
-        public void MaliciousRecursion()
-        {
-            string data64 = CodedInputStreamTest.MakeRecursiveMessage(64).ToString();
-            string data65 = CodedInputStreamTest.MakeRecursiveMessage(65).ToString();
-
-            var parser64 = new JsonParser(new JsonParser.Settings(64));
-            CodedInputStreamTest.AssertMessageDepth(parser64.Parse<TestRecursiveMessage>(data64), 64);
-            Assert.Throws<InvalidProtocolBufferException>(() => parser64.Parse<TestRecursiveMessage>(data65));
-
-            var parser63 = new JsonParser(new JsonParser.Settings(63));
-            Assert.Throws<InvalidProtocolBufferException>(() => parser63.Parse<TestRecursiveMessage>(data64));
-        }
-
-        [Test]
-        [TestCase("AQI")]
-        [TestCase("_-==")]
-        public void Bytes_InvalidBase64(string badBase64)
-        {
-            string json = "{ \"singleBytes\": \"" + badBase64 + "\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("\"FOREIGN_BAR\"", ForeignEnum.ForeignBar)]
-        [TestCase("5", ForeignEnum.ForeignBar)]
-        [TestCase("100", (ForeignEnum)100)]
-        public void EnumValid(string value, ForeignEnum expectedValue)
-        {
-            string json = "{ \"singleForeignEnum\": " + value + " }";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(new TestAllTypes { SingleForeignEnum = expectedValue }, parsed);
-        }
-
-        [Test]
-        [TestCase("\"NOT_A_VALID_VALUE\"")]
-        [TestCase("5.5")]
-        public void Enum_Invalid(string value)
-        {
-            string json = "{ \"singleForeignEnum\": " + value + " }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void OneofDuplicate_Invalid()
-        {
-            string json = "{ \"oneofString\": \"x\", \"oneofUint32\": 10 }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        /// <summary>
-        /// Various tests use strings which have quotes round them for parsing or as the result
-        /// of formatting, but without those quotes being specified in the tests (for the sake of readability).
-        /// This method simply returns the input, wrapped in double quotes.
-        /// </summary>
-        internal static string WrapInQuotes(string text)
-        {
-            return '"' + text + '"';
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs

@@ -1,408 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnit.Framework;
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    public class JsonTokenizerTest
-    {
-        [Test]
-        public void EmptyObjectValue()
-        {
-            AssertTokens("{}", JsonToken.StartObject, JsonToken.EndObject);
-        }
-
-        [Test]
-        public void EmptyArrayValue()
-        {
-            AssertTokens("[]", JsonToken.StartArray, JsonToken.EndArray);
-        }
-
-        [Test]
-        [TestCase("foo", "foo")]
-        [TestCase("tab\\t", "tab\t")]
-        [TestCase("line\\nfeed", "line\nfeed")]
-        [TestCase("carriage\\rreturn", "carriage\rreturn")]
-        [TestCase("back\\bspace", "back\bspace")]
-        [TestCase("form\\ffeed", "form\ffeed")]
-        [TestCase("escaped\\/slash", "escaped/slash")]
-        [TestCase("escaped\\\\backslash", "escaped\\backslash")]
-        [TestCase("escaped\\\"quote", "escaped\"quote")]
-        [TestCase("foo {}[] bar", "foo {}[] bar")]
-        [TestCase("foo\\u09aFbar", "foo\u09afbar")] // Digits, upper hex, lower hex
-        [TestCase("ab\ud800\udc00cd", "ab\ud800\udc00cd")]
-        [TestCase("ab\\ud800\\udc00cd", "ab\ud800\udc00cd")]
-        public void StringValue(string json, string expectedValue)
-        {
-            AssertTokensNoReplacement("\"" + json + "\"", JsonToken.Value(expectedValue));
-        }
-
-        // Valid surrogate pairs, with mixed escaping. These test cases can't be expressed
-        // using TestCase as they have no valid UTF-8 representation.
-        // It's unclear exactly how we should handle a mixture of escaped or not: that can't
-        // come from UTF-8 text, but could come from a .NET string. For the moment,
-        // treat it as valid in the obvious way.
-        [Test]
-        public void MixedSurrogatePairs()
-        {
-            string expected = "\ud800\udc00";
-            AssertTokens("'\\ud800\udc00'", JsonToken.Value(expected));
-            AssertTokens("'\ud800\\udc00'", JsonToken.Value(expected));
-        }
-
-        [Test]
-        public void ObjectDepth()
-        {
-            string json = "{ \"foo\": { \"x\": 1, \"y\": [ 0 ] } }";
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json));
-            // If we had more tests like this, I'd introduce a helper method... but for one test, it's not worth it.
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("foo"), tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("x"), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Value(1), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("y"), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartArray, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth); // Depth hasn't changed in array
-            Assert.AreEqual(JsonToken.Value(0), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndArray, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndObject, tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndObject, tokenizer.Next());
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-        }
-
-        [Test]
-        public void ObjectDepth_WithPushBack()
-        {
-            string json = "{}";
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json));
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            var token = tokenizer.Next();
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            // When we push back a "start object", we should effectively be back to the previous depth.
-            tokenizer.PushBack(token);
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            // Read the same token again, and get back to depth 1
-            token = tokenizer.Next();
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-
-            // Now the same in reverse, with EndObject
-            token = tokenizer.Next();
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            tokenizer.PushBack(token);
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            tokenizer.Next();
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-        }
-
-        [Test]
-        [TestCase("embedded tab\t")]
-        [TestCase("embedded CR\r")]
-        [TestCase("embedded LF\n")]
-        [TestCase("embedded bell\u0007")]
-        [TestCase("bad escape\\a")]
-        [TestCase("incomplete escape\\")]
-        [TestCase("incomplete Unicode escape\\u000")]
-        [TestCase("invalid Unicode escape\\u000H")]
-        // Surrogate pair handling, both in raw .NET strings and escaped. We only need
-        // to detect this in strings, as non-ASCII characters anywhere other than in strings
-        // will already lead to parsing errors.
-        [TestCase("\\ud800")]
-        [TestCase("\\udc00")]
-        [TestCase("\\ud800x")]
-        [TestCase("\\udc00x")]
-        [TestCase("\\udc00\\ud800y")]
-        public void InvalidStringValue(string json)
-        {
-            AssertThrowsAfter("\"" + json + "\"");
-        }
-
-        // Tests for invalid strings that can't be expressed in attributes,
-        // as the constants can't be expressed as UTF-8 strings.
-        [Test]
-        public void InvalidSurrogatePairs()
-        {
-            AssertThrowsAfter("\"\ud800x\"");
-            AssertThrowsAfter("\"\udc00y\"");
-            AssertThrowsAfter("\"\udc00\ud800y\"");
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // We don't distinguish between positive and negative 0
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        // From here on, assume leading sign is okay...
-        [TestCase("1.125", 1.125)]
-        [TestCase("1.0", 1)]
-        [TestCase("1e5", 100000)]
-        [TestCase("1e000000", 1)] // Weird, but not prohibited by the spec
-        [TestCase("1E5", 100000)]
-        [TestCase("1e+5", 100000)]
-        [TestCase("1E-5", 0.00001)]
-        [TestCase("123E-2", 1.23)]
-        [TestCase("123.45E3", 123450)]
-        [TestCase("   1   ", 1)]
-        public void NumberValue(string json, double expectedValue)
-        {
-            AssertTokens(json, JsonToken.Value(expectedValue));
-        }
-
-        [Test]
-        [TestCase("00")]
-        [TestCase(".5")]
-        [TestCase("1.")]
-        [TestCase("1e")]
-        [TestCase("1e-")]
-        [TestCase("--")]
-        [TestCase("--1")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1.7977e308")]
-        public void InvalidNumberValue(string json)
-        {
-            AssertThrowsAfter(json);
-        }
-
-        [Test]
-        [TestCase("nul")]
-        [TestCase("nothing")]
-        [TestCase("truth")]
-        [TestCase("fALSEhood")]
-        public void InvalidLiterals(string json)
-        {
-            AssertThrowsAfter(json);
-        }
-
-        [Test]
-        public void NullValue()
-        {
-            AssertTokens("null", JsonToken.Null);
-        }
-
-        [Test]
-        public void TrueValue()
-        {
-            AssertTokens("true", JsonToken.True);
-        }
-
-        [Test]
-        public void FalseValue()
-        {
-            AssertTokens("false", JsonToken.False);
-        }
-
-        [Test]
-        public void SimpleObject()
-        {
-            AssertTokens("{'x': 'y'}",
-                JsonToken.StartObject, JsonToken.Name("x"), JsonToken.Value("y"), JsonToken.EndObject);
-        }
-        
-        [Test]
-        [TestCase("[10, 20", 3)]
-        [TestCase("[10,", 2)]
-        [TestCase("[10:20]", 2)]
-        [TestCase("[", 1)]
-        [TestCase("[,", 1)]
-        [TestCase("{", 1)]
-        [TestCase("{,", 1)]
-        [TestCase("{[", 1)]
-        [TestCase("{{", 1)]
-        [TestCase("{0", 1)]
-        [TestCase("{null", 1)]
-        [TestCase("{false", 1)]
-        [TestCase("{true", 1)]
-        [TestCase("}", 0)]
-        [TestCase("]", 0)]
-        [TestCase(",", 0)]
-        [TestCase("'foo' 'bar'", 1)]
-        [TestCase(":", 0)]
-        [TestCase("'foo", 0)] // Incomplete string
-        [TestCase("{ 'foo' }", 2)]
-        [TestCase("{ x:1", 1)] // Property names must be quoted
-        [TestCase("{]", 1)]
-        [TestCase("[}", 1)]
-        [TestCase("[1,", 2)]
-        [TestCase("{'x':0]", 3)]
-        [TestCase("{ 'foo': }", 2)]
-        [TestCase("{ 'foo':'bar', }", 3)]
-        public void InvalidStructure(string json, int expectedValidTokens)
-        {
-            // Note: we don't test that the earlier tokens are exactly as expected,
-            // partly because that's hard to parameterize.
-            var reader = new StringReader(json.Replace('\'', '"'));
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedValidTokens; i++)
-            {
-                Assert.IsNotNull(tokenizer.Next());
-            }
-            Assert.Throws<InvalidJsonException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        public void ArrayMixedType()
-        {
-            AssertTokens("[1, 'foo', null, false, true, [2], {'x':'y' }]",
-                JsonToken.StartArray,
-                JsonToken.Value(1),
-                JsonToken.Value("foo"),
-                JsonToken.Null,
-                JsonToken.False,
-                JsonToken.True,
-                JsonToken.StartArray,
-                JsonToken.Value(2),
-                JsonToken.EndArray,
-                JsonToken.StartObject,
-                JsonToken.Name("x"),
-                JsonToken.Value("y"),
-                JsonToken.EndObject,
-                JsonToken.EndArray);
-        }
-
-        [Test]
-        public void ObjectMixedType()
-        {
-            AssertTokens(@"{'a': 1, 'b': 'bar', 'c': null, 'd': false, 'e': true, 
-                           'f': [2], 'g': {'x':'y' }}",
-                JsonToken.StartObject,
-                JsonToken.Name("a"),
-                JsonToken.Value(1),
-                JsonToken.Name("b"),
-                JsonToken.Value("bar"),
-                JsonToken.Name("c"),
-                JsonToken.Null,
-                JsonToken.Name("d"),
-                JsonToken.False,
-                JsonToken.Name("e"),
-                JsonToken.True,
-                JsonToken.Name("f"),
-                JsonToken.StartArray,
-                JsonToken.Value(2),
-                JsonToken.EndArray,
-                JsonToken.Name("g"),
-                JsonToken.StartObject,
-                JsonToken.Name("x"),
-                JsonToken.Value("y"),
-                JsonToken.EndObject,
-                JsonToken.EndObject);
-        }
-
-        [Test]
-        public void NextAfterEndDocumentThrows()
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader("null"));
-            Assert.AreEqual(JsonToken.Null, tokenizer.Next());
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.Throws<InvalidOperationException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        public void CanPushBackEndDocument()
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader("null"));
-            Assert.AreEqual(JsonToken.Null, tokenizer.Next());
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            tokenizer.PushBack(JsonToken.EndDocument);
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.Throws<InvalidOperationException>(() => tokenizer.Next());
-        }
-       
-        /// <summary>
-        /// Asserts that the specified JSON is tokenized into the given sequence of tokens.
-        /// All apostrophes are first converted to double quotes, allowing any tests
-        /// that don't need to check actual apostrophe handling to use apostrophes in the JSON, avoiding
-        /// messy string literal escaping. The "end document" token is not specified in the list of 
-        /// expected tokens, but is implicit.
-        /// </summary>
-        private static void AssertTokens(string json, params JsonToken[] expectedTokens)
-        {
-            AssertTokensNoReplacement(json.Replace('\'', '"'), expectedTokens);
-        }
-
-        /// <summary>
-        /// Asserts that the specified JSON is tokenized into the given sequence of tokens.
-        /// Unlike <see cref="AssertTokens(string, JsonToken[])"/>, this does not perform any character
-        /// replacement on the specified JSON, and should be used when the text contains apostrophes which
-        /// are expected to be used *as* apostrophes. The "end document" token is not specified in the list of 
-        /// expected tokens, but is implicit.
-        /// </summary>
-        private static void AssertTokensNoReplacement(string json, params JsonToken[] expectedTokens)
-        {
-            var reader = new StringReader(json);
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedTokens.Length; i++)
-            {
-                var actualToken = tokenizer.Next();
-                if (actualToken == JsonToken.EndDocument)
-                {
-                    Assert.Fail("Expected {0} but reached end of token stream", expectedTokens[i]);
-                }
-                Assert.AreEqual(expectedTokens[i], actualToken);
-            }
-            var finalToken = tokenizer.Next();
-            if (finalToken != JsonToken.EndDocument)
-            {
-                Assert.Fail("Expected token stream to be exhausted; received {0}", finalToken);
-            }
-        }
-
-        private static void AssertThrowsAfter(string json, params JsonToken[] expectedTokens)
-        {
-            var reader = new StringReader(json);
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedTokens.Length; i++)
-            {
-                var actualToken = tokenizer.Next();
-                if (actualToken == JsonToken.EndDocument)
-                {
-                    Assert.Fail("Expected {0} but reached end of document", expectedTokens[i]);
-                }
-                Assert.AreEqual(expectedTokens[i], actualToken);
-            }
-            Assert.Throws<InvalidJsonException>(() => tokenizer.Next());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs

@@ -1,259 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Linq;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using UnitTest.Issues.TestProtos;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Tests for descriptors. (Not in its own namespace or broken up into individual classes as the
-    /// size doesn't warrant it. On the other hand, this makes me feel a bit dirty...)
-    /// </summary>
-    public class DescriptorsTest
-    {
-        [Test]
-        public void FileDescriptor()
-        {
-            FileDescriptor file = UnittestProto3Reflection.Descriptor;
-
-            Assert.AreEqual("google/protobuf/unittest_proto3.proto", file.Name);
-            Assert.AreEqual("protobuf_unittest", file.Package);
-
-            Assert.AreEqual("UnittestProto", file.Proto.Options.JavaOuterClassname);
-            Assert.AreEqual("google/protobuf/unittest_proto3.proto", file.Proto.Name);
-
-            // unittest.proto doesn't have any public imports, but unittest_import.proto does.
-            Assert.AreEqual(0, file.PublicDependencies.Count);
-            Assert.AreEqual(1, UnittestImportProto3Reflection.Descriptor.PublicDependencies.Count);
-            Assert.AreEqual(UnittestImportPublicProto3Reflection.Descriptor, UnittestImportProto3Reflection.Descriptor.PublicDependencies[0]);
-
-            Assert.AreEqual(1, file.Dependencies.Count);
-            Assert.AreEqual(UnittestImportProto3Reflection.Descriptor, file.Dependencies[0]);
-
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            Assert.AreSame(typeof(TestAllTypes), messageType.ClrType);
-            Assert.AreSame(TestAllTypes.Parser, messageType.Parser);
-            Assert.AreEqual(messageType, file.MessageTypes[0]);
-            Assert.AreEqual(messageType, file.FindTypeByName<MessageDescriptor>("TestAllTypes"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("protobuf_unittest.TestAllTypes"));
-            for (int i = 0; i < file.MessageTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.MessageTypes[i].Index);
-            }
-
-            Assert.AreEqual(file.EnumTypes[0], file.FindTypeByName<EnumDescriptor>("ForeignEnum"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("protobuf_unittest.ForeignEnum"));
-            Assert.AreEqual(1, UnittestImportProto3Reflection.Descriptor.EnumTypes.Count);
-            Assert.AreEqual("ImportEnum", UnittestImportProto3Reflection.Descriptor.EnumTypes[0].Name);
-            for (int i = 0; i < file.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.EnumTypes[i].Index);
-            }
-
-            Assert.AreEqual(10, file.SerializedData[0]);
-        }
-
-        [Test]
-        public void MessageDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            MessageDescriptor nestedType = TestAllTypes.Types.NestedMessage.Descriptor;
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes", messageType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, messageType.File);
-            Assert.IsNull(messageType.ContainingType);
-            Assert.IsNull(messageType.Proto.Options);
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-
-            Assert.AreEqual("NestedMessage", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedMessage", nestedType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, nestedType.File);
-            Assert.AreEqual(messageType, nestedType.ContainingType);
-
-            FieldDescriptor field = messageType.Fields.InDeclarationOrder()[0];
-            Assert.AreEqual("single_int32", field.Name);
-            Assert.AreEqual(field, messageType.FindDescriptor<FieldDescriptor>("single_int32"));
-            Assert.Null(messageType.FindDescriptor<FieldDescriptor>("no_such_field"));
-            Assert.AreEqual(field, messageType.FindFieldByNumber(1));
-            Assert.Null(messageType.FindFieldByNumber(571283));
-            var fieldsInDeclarationOrder = messageType.Fields.InDeclarationOrder();
-            for (int i = 0; i < fieldsInDeclarationOrder.Count; i++)
-            {
-                Assert.AreEqual(i, fieldsInDeclarationOrder[i].Index);
-            }
-
-            Assert.AreEqual(nestedType, messageType.NestedTypes[0]);
-            Assert.AreEqual(nestedType, messageType.FindDescriptor<MessageDescriptor>("NestedMessage"));
-            Assert.Null(messageType.FindDescriptor<MessageDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.NestedTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.NestedTypes[i].Index);
-            }
-
-            Assert.AreEqual(messageType.EnumTypes[0], messageType.FindDescriptor<EnumDescriptor>("NestedEnum"));
-            Assert.Null(messageType.FindDescriptor<EnumDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.EnumTypes[i].Index);
-            }
-        }
-
-        [Test]
-        public void FieldDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            FieldDescriptor primitiveField = messageType.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor enumField = messageType.FindDescriptor<FieldDescriptor>("single_nested_enum");
-            FieldDescriptor messageField = messageType.FindDescriptor<FieldDescriptor>("single_foreign_message");
-
-            Assert.AreEqual("single_int32", primitiveField.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.single_int32",
-                            primitiveField.FullName);
-            Assert.AreEqual(1, primitiveField.FieldNumber);
-            Assert.AreEqual(messageType, primitiveField.ContainingType);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, primitiveField.File);
-            Assert.AreEqual(FieldType.Int32, primitiveField.FieldType);
-            Assert.IsNull(primitiveField.Proto.Options);
-            
-            Assert.AreEqual("single_nested_enum", enumField.Name);
-            Assert.AreEqual(FieldType.Enum, enumField.FieldType);
-            // Assert.AreEqual(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType);
-
-            Assert.AreEqual("single_foreign_message", messageField.Name);
-            Assert.AreEqual(FieldType.Message, messageField.FieldType);
-            Assert.AreEqual(ForeignMessage.Descriptor, messageField.MessageType);
-        }
-
-        [Test]
-        public void FieldDescriptorLabel()
-        {
-            FieldDescriptor singleField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor repeatedField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("repeated_int32");
-
-            Assert.IsFalse(singleField.IsRepeated);
-            Assert.IsTrue(repeatedField.IsRepeated);
-        }
-
-        [Test]
-        public void EnumDescriptor()
-        {
-            // Note: this test is a bit different to the Java version because there's no static way of getting to the descriptor
-            EnumDescriptor enumType = UnittestProto3Reflection.Descriptor.FindTypeByName<EnumDescriptor>("ForeignEnum");
-            EnumDescriptor nestedType = TestAllTypes.Descriptor.FindDescriptor<EnumDescriptor>("NestedEnum");
-
-            Assert.AreEqual("ForeignEnum", enumType.Name);
-            Assert.AreEqual("protobuf_unittest.ForeignEnum", enumType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, enumType.File);
-            Assert.Null(enumType.ContainingType);
-            Assert.Null(enumType.Proto.Options);
-
-            Assert.AreEqual("NestedEnum", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedEnum",
-                            nestedType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, nestedType.File);
-            Assert.AreEqual(TestAllTypes.Descriptor, nestedType.ContainingType);
-
-            EnumValueDescriptor value = enumType.FindValueByName("FOREIGN_FOO");
-            Assert.AreEqual(value, enumType.Values[1]);
-            Assert.AreEqual("FOREIGN_FOO", value.Name);
-            Assert.AreEqual(4, value.Number);
-            Assert.AreEqual((int) ForeignEnum.ForeignFoo, value.Number);
-            Assert.AreEqual(value, enumType.FindValueByNumber(4));
-            Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE"));
-            for (int i = 0; i < enumType.Values.Count; i++)
-            {
-                Assert.AreEqual(i, enumType.Values[i].Index);
-            }
-        }
-
-        [Test]
-        public void OneofDescriptor()
-        {
-            OneofDescriptor descriptor = TestAllTypes.Descriptor.FindDescriptor<OneofDescriptor>("oneof_field");
-            Assert.AreEqual("oneof_field", descriptor.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.oneof_field", descriptor.FullName);
-
-            var expectedFields = new[] {
-                TestAllTypes.OneofBytesFieldNumber,
-                TestAllTypes.OneofNestedMessageFieldNumber,
-                TestAllTypes.OneofStringFieldNumber,
-                TestAllTypes.OneofUint32FieldNumber }
-                .Select(fieldNumber => TestAllTypes.Descriptor.FindFieldByNumber(fieldNumber))
-                .ToList();
-            foreach (var field in expectedFields)
-            {
-                Assert.AreSame(descriptor, field.ContainingOneof);
-            }
-
-            CollectionAssert.AreEquivalent(expectedFields, descriptor.Fields);
-        }
-
-        [Test]
-        public void MapEntryMessageDescriptor()
-        {
-            var descriptor = MapWellKnownTypes.Descriptor.NestedTypes[0];
-            Assert.IsNull(descriptor.Parser);
-            Assert.IsNull(descriptor.ClrType);
-            Assert.IsNull(descriptor.Fields[1].Accessor);
-        }
-
-        // From TestFieldOrdering:
-        // string my_string = 11;
-        // int64 my_int = 1;
-        // float my_float = 101;
-        // NestedMessage single_nested_message = 200;
-        [Test]
-        public void FieldListOrderings()
-        { 
-            var fields = TestFieldOrderings.Descriptor.Fields;
-            Assert.AreEqual(new[] { 11, 1, 101, 200 }, fields.InDeclarationOrder().Select(x => x.FieldNumber));
-            Assert.AreEqual(new[] { 1, 11, 101, 200 }, fields.InFieldNumberOrder().Select(x => x.FieldNumber));
-        }
-
-
-        [Test]
-        public void DescriptorProtoFileDescriptor()
-        {
-            var descriptor = Google.Protobuf.Reflection.FileDescriptor.DescriptorProtoFileDescriptor;
-            Assert.AreEqual("google/protobuf/descriptor.proto", descriptor.Name);
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs

@@ -1,218 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Reflection
-{
-    public class FieldAccessTest
-    {
-        [Test]
-        public void GetValue()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestAllTypes.Descriptor.Fields;
-            Assert.AreEqual(message.SingleBool, fields[TestAllTypes.SingleBoolFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleBytes, fields[TestAllTypes.SingleBytesFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleDouble, fields[TestAllTypes.SingleDoubleFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFixed32, fields[TestAllTypes.SingleFixed32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFixed64, fields[TestAllTypes.SingleFixed64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFloat, fields[TestAllTypes.SingleFloatFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleForeignEnum, fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleForeignMessage, fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleImportEnum, fields[TestAllTypes.SingleImportEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleImportMessage, fields[TestAllTypes.SingleImportMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleInt32, fields[TestAllTypes.SingleInt32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleInt64, fields[TestAllTypes.SingleInt64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleNestedEnum, fields[TestAllTypes.SingleNestedEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleNestedMessage, fields[TestAllTypes.SingleNestedMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SinglePublicImportMessage, fields[TestAllTypes.SinglePublicImportMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSint32, fields[TestAllTypes.SingleSint32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSint64, fields[TestAllTypes.SingleSint64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleString, fields[TestAllTypes.SingleStringFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSfixed32, fields[TestAllTypes.SingleSfixed32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSfixed64, fields[TestAllTypes.SingleSfixed64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleUint32, fields[TestAllTypes.SingleUint32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleUint64, fields[TestAllTypes.SingleUint64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofBytes, fields[TestAllTypes.OneofBytesFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofString, fields[TestAllTypes.OneofStringFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofNestedMessage, fields[TestAllTypes.OneofNestedMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofUint32, fields[TestAllTypes.OneofUint32FieldNumber].Accessor.GetValue(message));
-
-            // Just one example for repeated fields - they're all just returning the list
-            var list = (IList) fields[TestAllTypes.RepeatedInt32FieldNumber].Accessor.GetValue(message);
-            Assert.AreEqual(message.RepeatedInt32, list);
-            Assert.AreEqual(message.RepeatedInt32[0], list[0]); // Just in case there was any doubt...
-
-            // Just a single map field, for the same reason
-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            fields = TestMap.Descriptor.Fields;
-            var dictionary = (IDictionary) fields[TestMap.MapStringStringFieldNumber].Accessor.GetValue(mapMessage);
-            Assert.AreEqual(mapMessage.MapStringString, dictionary);
-            Assert.AreEqual("value1", dictionary["key1"]);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestAllTypes.Descriptor.Fields;
-            fields[TestAllTypes.SingleBoolFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleInt32FieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleStringFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleBytesFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.RepeatedDoubleFieldNumber].Accessor.Clear(message);
-
-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())
-            {
-                SingleBool = false,
-                SingleInt32 = 0,
-                SingleString = "",
-                SingleBytes = ByteString.Empty,
-                SingleForeignEnum = 0,
-                SingleForeignMessage = null,
-            };
-            expected.RepeatedDouble.Clear();
-
-            Assert.AreEqual(expected, message);
-
-            // Separately, maps.
-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            fields = TestMap.Descriptor.Fields;
-            fields[TestMap.MapStringStringFieldNumber].Accessor.Clear(mapMessage);
-            Assert.AreEqual(0, mapMessage.MapStringString.Count);
-        }
-
-        [Test]
-        public void SetValue_SingleFields()
-        {
-            // Just a sample (primitives, messages, enums, strings, byte strings)
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestAllTypes.Descriptor.Fields;
-            fields[TestAllTypes.SingleBoolFieldNumber].Accessor.SetValue(message, false);
-            fields[TestAllTypes.SingleInt32FieldNumber].Accessor.SetValue(message, 500);
-            fields[TestAllTypes.SingleStringFieldNumber].Accessor.SetValue(message, "It's a string");
-            fields[TestAllTypes.SingleBytesFieldNumber].Accessor.SetValue(message, ByteString.CopyFrom(99, 98, 97));
-            fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.SetValue(message, ForeignEnum.ForeignFoo);
-            fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.SetValue(message, new ForeignMessage { C = 12345 });
-            fields[TestAllTypes.SingleDoubleFieldNumber].Accessor.SetValue(message, 20150701.5);
-
-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())
-            {
-                SingleBool = false,
-                SingleInt32 = 500,
-                SingleString = "It's a string",
-                SingleBytes = ByteString.CopyFrom(99, 98, 97),
-                SingleForeignEnum = ForeignEnum.ForeignFoo,
-                SingleForeignMessage = new ForeignMessage { C = 12345 },
-                SingleDouble = 20150701.5
-            };
-
-            Assert.AreEqual(expected, message);
-        }
-
-        [Test]
-        public void SetValue_SingleFields_WrongType()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidCastException>(() => fields[TestAllTypes.SingleBoolFieldNumber].Accessor.SetValue(message, "This isn't a bool"));
-        }
-
-        [Test]
-        public void SetValue_MapFields()
-        {
-            IMessage message = new TestMap();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestMap.MapStringStringFieldNumber].Accessor.SetValue(message, new Dictionary<string, string>()));
-        }
-
-        [Test]
-        public void SetValue_RepeatedFields()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestAllTypes.RepeatedDoubleFieldNumber].Accessor.SetValue(message, new double[10]));
-        }
-
-        [Test]
-        public void GetValue_IncorrectType()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidCastException>(() => fields[TestAllTypes.SingleBoolFieldNumber].Accessor.GetValue(new TestMap()));
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new TestAllTypes();
-            var descriptor = TestAllTypes.Descriptor;
-            Assert.AreEqual(1, descriptor.Oneofs.Count);
-            var oneof = descriptor.Oneofs[0];
-            Assert.AreEqual("oneof_field", oneof.Name);
-            Assert.IsNull(oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            message.OneofString = "foo";
-            Assert.AreSame(descriptor.Fields[TestAllTypes.OneofStringFieldNumber], oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            message.OneofUint32 = 10;
-            Assert.AreSame(descriptor.Fields[TestAllTypes.OneofUint32FieldNumber], oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            oneof.Accessor.Clear(message);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void FieldDescriptor_ByName()
-        {
-            var descriptor = TestAllTypes.Descriptor;
-            Assert.AreSame(
-                descriptor.Fields[TestAllTypes.SingleBoolFieldNumber],
-                descriptor.Fields["single_bool"]);
-        }
-
-        [Test]
-        public void FieldDescriptor_NotFound()
-        {
-            var descriptor = TestAllTypes.Descriptor;
-            Assert.Throws<KeyNotFoundException>(() => descriptor.Fields[999999].ToString());
-            Assert.Throws<KeyNotFoundException>(() => descriptor.Fields["not found"].ToString());
-        }        
-    }
-}

csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs

@@ -1,94 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Reflection
-{
-    public class TypeRegistryTest
-    {
-        // Most of our tests use messages. Simple test that we really can use files...
-        [Test]
-        public void CreateWithFileDescriptor()
-        {
-            var registry = TypeRegistry.FromFiles(DurationReflection.Descriptor, StructReflection.Descriptor);
-            AssertDescriptorPresent(registry, Duration.Descriptor);
-            AssertDescriptorPresent(registry, ListValue.Descriptor);
-            AssertDescriptorAbsent(registry, Timestamp.Descriptor);
-        }
-
-        [Test]
-        public void TypesFromSameFile()
-        {
-            // Just for kicks, let's start with a nested type
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Types.NestedMessage.Descriptor);
-            // Top-level...
-            AssertDescriptorPresent(registry, TestFieldOrderings.Descriptor);
-            // ... and nested (not the same as the original NestedMessage!)
-            AssertDescriptorPresent(registry, TestFieldOrderings.Types.NestedMessage.Descriptor);
-        }
-
-        [Test]
-        public void DependenciesAreIncluded()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            // Direct dependencies
-            AssertDescriptorPresent(registry, ImportMessage.Descriptor);
-            // Public dependencies
-            AssertDescriptorPresent(registry, PublicImportMessage.Descriptor);
-        }
-
-        [Test]
-        public void DuplicateFiles()
-        {
-            // Duplicates via dependencies and simply via repetition
-            var registry = TypeRegistry.FromFiles(
-                UnittestProto3Reflection.Descriptor, UnittestImportProto3Reflection.Descriptor,
-                TimestampReflection.Descriptor, TimestampReflection.Descriptor);
-            AssertDescriptorPresent(registry, TestAllTypes.Descriptor);
-            AssertDescriptorPresent(registry, ImportMessage.Descriptor);
-            AssertDescriptorPresent(registry, Timestamp.Descriptor);
-        }
-
-        private static void AssertDescriptorPresent(TypeRegistry registry, MessageDescriptor descriptor)
-        {
-            Assert.AreSame(descriptor, registry.Find(descriptor.FullName));
-        }
-
-        private static void AssertDescriptorAbsent(TypeRegistry registry, MessageDescriptor descriptor)
-        {
-            Assert.IsNull(registry.Find(descriptor.FullName));
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/SampleEnum.cs

@@ -1,42 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-namespace Google.Protobuf
-{
-    // Just a sample enum with positive and negative values to be used in tests.
-    internal enum SampleEnum
-    {
-        NegativeValue = -2,
-        None = 0,
-        PositiveValue = 3
-    }
-}

csharp/src/Google.Protobuf.Test/SampleMessages.cs

@@ -1,99 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods to create sample instances of types generated from unit test messages.
-    /// </summary>
-    public class SampleMessages
-    {
-        /// <summary>
-        /// Creates a new sample TestAllTypes message with all fields populated.
-        /// The "oneof" field is populated with the string property (OneofString).
-        /// </summary>
-        public static TestAllTypes CreateFullTestAllTypes()
-        {
-            return new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = UInt32.MaxValue,
-                SingleUint64 = UInt64.MaxValue,
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6), ByteString.CopyFrom(new byte[1000]) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { UInt32.MaxValue, 23 },
-                RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, Int64.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue },
-                RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue },
-                OneofString = "Oneof string"
-            };
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/TestCornerCases.cs

@@ -1,62 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using UnitTest.Issues.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class TestCornerCases
-    {
-        [Test]
-        public void TestRoundTripNegativeEnums()
-        {
-            NegativeEnumMessage msg = new NegativeEnumMessage
-            {
-                Value = NegativeEnum.MinusOne,
-                Values = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow },
-                PackedValues = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow }
-            };
-
-            Assert.AreEqual(58, msg.CalculateSize());
-
-            byte[] bytes = new byte[58];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-
-            msg.WriteTo(output);
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            NegativeEnumMessage copy = NegativeEnumMessage.Parser.ParseFrom(bytes);
-            Assert.AreEqual(msg, copy);
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs

@@ -1,45 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.TestProtos
-{
-    /// <summary>
-    /// A message with custom diagnostics (to test that they work).
-    /// </summary>
-    public partial class ForeignMessage : ICustomDiagnosticMessage
-    {
-        public string ToDiagnosticString()
-        {
-            return $"{{ \"c\": {C}, \"@cInHex\": \"{C:x}\" }}";
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs

@@ -1,174 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/unittest_import_proto3.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/unittest_import_proto3.proto</summary>
-  public static partial class UnittestImportProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/unittest_import_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cixnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfaW1wb3J0X3Byb3RvMy5wcm90",
-            "bxIYcHJvdG9idWZfdW5pdHRlc3RfaW1wb3J0GjNnb29nbGUvcHJvdG9idWYv",
-            "dW5pdHRlc3RfaW1wb3J0X3B1YmxpY19wcm90bzMucHJvdG8iGgoNSW1wb3J0",
-            "TWVzc2FnZRIJCgFkGAEgASgFKlkKCkltcG9ydEVudW0SGwoXSU1QT1JUX0VO",
-            "VU1fVU5TUEVDSUZJRUQQABIOCgpJTVBPUlRfRk9PEAcSDgoKSU1QT1JUX0JB",
-            "UhAIEg4KCklNUE9SVF9CQVoQCUI8Chhjb20uZ29vZ2xlLnByb3RvYnVmLnRl",
-            "c3RIAfgBAaoCGkdvb2dsZS5Qcm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3Rv",
-            "Mw=="));
-      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[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.ImportMessage), global::Google.Protobuf.TestProtos.ImportMessage.Parser, new[]{ "D" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ImportEnum {
-    [pbr::OriginalName("IMPORT_ENUM_UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("IMPORT_FOO")] ImportFoo = 7,
-    [pbr::OriginalName("IMPORT_BAR")] ImportBar = 8,
-    [pbr::OriginalName("IMPORT_BAZ")] ImportBaz = 9,
-  }
-
-  #endregion
-
-  #region Messages
-  public sealed partial class ImportMessage : pb::IMessage<ImportMessage> {
-    private static readonly pb::MessageParser<ImportMessage> _parser = new pb::MessageParser<ImportMessage>(() => new ImportMessage());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<ImportMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ImportMessage(ImportMessage other) : this() {
-      d_ = other.d_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public ImportMessage Clone() {
-      return new ImportMessage(this);
-    }
-
-    /// <summary>Field number for the "d" field.</summary>
-    public const int DFieldNumber = 1;
-    private int d_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int D {
-      get { return d_; }
-      set {
-        d_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as ImportMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(ImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (D != other.D) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (D != 0) hash ^= D.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (D != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(D);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (D != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(D);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(ImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.D != 0) {
-        D = other.D;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 8: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs

@@ -1,160 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/unittest_import_public_proto3.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/unittest_import_public_proto3.proto</summary>
-  public static partial class UnittestImportPublicProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/unittest_import_public_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportPublicProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CjNnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfaW1wb3J0X3B1YmxpY19wcm90",
-            "bzMucHJvdG8SGHByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydCIgChNQdWJsaWNJ",
-            "bXBvcnRNZXNzYWdlEgkKAWUYASABKAVCNwoYY29tLmdvb2dsZS5wcm90b2J1",
-            "Zi50ZXN0qgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), global::Google.Protobuf.TestProtos.PublicImportMessage.Parser, new[]{ "E" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class PublicImportMessage : pb::IMessage<PublicImportMessage> {
-    private static readonly pb::MessageParser<PublicImportMessage> _parser = new pb::MessageParser<PublicImportMessage>(() => new PublicImportMessage());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<PublicImportMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PublicImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PublicImportMessage(PublicImportMessage other) : this() {
-      e_ = other.e_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PublicImportMessage Clone() {
-      return new PublicImportMessage(this);
-    }
-
-    /// <summary>Field number for the "e" field.</summary>
-    public const int EFieldNumber = 1;
-    private int e_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int E {
-      get { return e_; }
-      set {
-        e_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as PublicImportMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(PublicImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (E != other.E) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (E != 0) hash ^= E.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (E != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(E);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (E != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(E);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(PublicImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.E != 0) {
-        E = other.E;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 8: {
-            E = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs

@@ -1,116 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class AnyTest
-    {
-        [Test]
-        public void Pack()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.AreEqual("type.googleapis.com/protobuf_unittest.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Pack_WithCustomPrefix()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz");
-            Assert.AreEqual("foo.bar/baz/protobuf_unittest.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Pack_WithCustomPrefixTrailingSlash()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz/");
-            Assert.AreEqual("foo.bar/baz/protobuf_unittest.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Unpack_WrongType()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.Throws<InvalidProtocolBufferException>(() => any.Unpack<TestOneof>());
-        }
-
-        [Test]
-        public void Unpack_Success()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            var unpacked = any.Unpack<TestAllTypes>();
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void Unpack_CustomPrefix_Success()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz");
-            var unpacked = any.Unpack<TestAllTypes>();
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void ToString_WithValues()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            var text = any.ToString();
-            Assert.That(text, Does.Contain("\"@value\": \"" + message.ToByteString().ToBase64() + "\""));
-        }
-
-        [Test]
-        public void ToString_Empty()
-        {
-            var any = new Any();
-            Assert.AreEqual("{ \"@type\": \"\", \"@value\": \"\" }", any.ToString());
-        }
-
-        [Test]
-        public void ToString_MessageContainingAny()
-        {
-            var message = new TestWellKnownTypes { AnyField = new Any() };
-            Assert.AreEqual("{ \"anyField\": { \"@type\": \"\", \"@value\": \"\" } }", message.ToString());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs

@@ -1,132 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class DurationTest
-    {
-        [Test]
-        public void ToTimeSpan()
-        {
-            Assert.AreEqual(TimeSpan.FromSeconds(1), new Duration { Seconds = 1 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromSeconds(-1), new Duration { Seconds = -1 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromMilliseconds(1), new Duration { Nanos = 1000000 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromMilliseconds(-1), new Duration { Nanos = -1000000 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(1), new Duration { Nanos = 100 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(-1), new Duration { Nanos = -100 }.ToTimeSpan());
-
-            // Rounding is towards 0
-            Assert.AreEqual(TimeSpan.FromTicks(2), new Duration { Nanos = 250 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(-2), new Duration { Nanos = -250 }.ToTimeSpan());
-        }
-
-        [Test]
-        public void Addition()
-        {
-            Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = -2, Nanos = -100000000 },
-                new Duration { Seconds = -1, Nanos = -600000000 } + new Duration { Nanos = -500000000 });
-            Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = -500000000 });
-
-            // Non-normalized durations, or non-normalized intermediate results
-            Assert.AreEqual(new Duration { Seconds = 1 },
-                new Duration { Seconds = 1, Nanos = -500000000 } + new Duration { Nanos = 500000000 });
-
-            Assert.AreEqual(new Duration { Nanos = -900000000 },
-                new Duration { Seconds = -1, Nanos = -100000000 } + new Duration { Nanos = 200000000 });
-            Assert.AreEqual(new Duration { Nanos = 900000000 },
-                new Duration { Seconds = 1, Nanos = 100000000 } + new Duration { Nanos = -200000000 });
-        }
-
-        [Test]
-        public void Subtraction()
-        {
-            Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = -1, Nanos = -100000000 },
-                new Duration { Seconds = -1, Nanos = -600000000 } - new Duration { Nanos = -500000000 });
-            Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = -500000000 });
-
-            // Non-normalized durations
-            Assert.AreEqual(new Duration(),
-                new Duration { Seconds = 1, Nanos = -500000000 } - new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = 1 },
-                new Duration { Nanos = 2000000000 } - new Duration { Nanos = 1000000000 });
-        }
-
-        [Test]
-        public void FromTimeSpan()
-        {
-            Assert.AreEqual(new Duration { Seconds = 1 }, Duration.FromTimeSpan(TimeSpan.FromSeconds(1)));
-            Assert.AreEqual(new Duration { Nanos = Duration.NanosecondsPerTick }, Duration.FromTimeSpan(TimeSpan.FromTicks(1)));
-        }
-
-        [Test]
-        [TestCase(0, Duration.MaxNanoseconds + 1)]
-        [TestCase(0, Duration.MinNanoseconds - 1)]
-        [TestCase(Duration.MinSeconds - 1, 0)]
-        [TestCase(Duration.MaxSeconds + 1, 0)]
-        [TestCase(1, -1)]
-        [TestCase(-1, 1)]
-        public void ToTimeSpan_Invalid(long seconds, int nanoseconds)
-        {
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => duration.ToTimeSpan());
-        }
-
-        [Test]
-        [TestCase(0, Duration.MaxNanoseconds)]
-        [TestCase(0, Duration.MinNanoseconds)]
-        [TestCase(Duration.MinSeconds, Duration.MinNanoseconds)]
-        [TestCase(Duration.MaxSeconds, Duration.MaxNanoseconds)]
-        public void ToTimeSpan_Valid(long seconds, int nanoseconds)
-        {
-            // Only testing that these values don't throw, unlike their similar tests in ToTimeSpan_Invalid
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            duration.ToTimeSpan();
-        }
-
-        [Test]
-        public void ToString_NonNormalized()
-        {
-            // Just a single example should be sufficient...
-            var duration = new Duration { Seconds = 1, Nanos = -1 };
-            Assert.AreEqual("{ \"@warning\": \"Invalid Duration\", \"seconds\": \"1\", \"nanos\": -1 }", duration.ToString());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs

@@ -1,62 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-
-using NUnit.Framework;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class FieldMaskTest
-    {
-        [Test]
-        [TestCase("foo__bar")]
-        [TestCase("foo_3_ar")]
-        [TestCase("fooBar")]
-        public void ToString_Invalid(string input)
-        {
-            var mask = new FieldMask { Paths = { input } };
-            var text = mask.ToString();
-            // More specific test below
-            Assert.That(text, Does.Contain("@warning"));
-            Assert.That(text, Does.Contain(input));
-        }
-
-        [Test]
-        public void ToString_Invalid_Precise()
-        {
-            var mask = new FieldMask { Paths = { "x", "foo__bar", @"x\y" } };
-            Assert.AreEqual(
-                "{ \"@warning\": \"Invalid FieldMask\", \"paths\": [ \"x\", \"foo__bar\", \"x\\\\y\" ] }",
-                mask.ToString());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs

@@ -1,115 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class TimestampTest
-    {
-        [Test]
-        public void FromAndToDateTime()
-        {
-            DateTime utcMin = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
-            DateTime utcMax = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
-            AssertRoundtrip(new Timestamp { Seconds = -62135596800 }, utcMin);
-            AssertRoundtrip(new Timestamp { Seconds = 253402300799, Nanos = 999999900 }, utcMax);
-            AssertRoundtrip(new Timestamp(), new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Nanos = 1000000}, new DateTime(1970, 1, 1, 0, 0, 0, 1, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = -1, Nanos = 999000000 }, new DateTime(1969, 12, 31, 23, 59, 59, 999, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = 3600 }, new DateTime(1970, 1, 1, 1, 0, 0, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = -3600 }, new DateTime(1969, 12, 31, 23, 0, 0, DateTimeKind.Utc));
-        }
-
-        [Test]
-        public void ToDateTimeTruncation()
-        {
-            var t1 = new Timestamp { Seconds = 1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 };
-            Assert.AreEqual(new DateTime(1970, 1, 1, 0, 0, 1, DateTimeKind.Utc).AddMilliseconds(1), t1.ToDateTime());
-
-            var t2 = new Timestamp { Seconds = -1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 };
-            Assert.AreEqual(new DateTime(1969, 12, 31, 23, 59, 59).AddMilliseconds(1), t2.ToDateTime());
-        }
-
-        [Test]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue - 1, Timestamp.MaxNanos)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue + 1, 0)]
-        [TestCase(0, -1)]
-        [TestCase(0, Timestamp.MaxNanos + 1)]
-        public void ToDateTime_OutOfRange(long seconds, int nanoseconds)
-        {
-            var value = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => value.ToDateTime());
-        }
-
-        // 1ns larger or smaller than the above values
-        [Test]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue, 0)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue, Timestamp.MaxNanos)]
-        [TestCase(0, 0)]
-        [TestCase(0, Timestamp.MaxNanos)]
-        public void ToDateTime_ValidBoundaries(long seconds, int nanoseconds)
-        {
-            var value = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            value.ToDateTime();
-        }
-
-        private static void AssertRoundtrip(Timestamp timestamp, DateTime dateTime)
-        {
-            Assert.AreEqual(timestamp, Timestamp.FromDateTime(dateTime));
-            Assert.AreEqual(dateTime, timestamp.ToDateTime());
-            Assert.AreEqual(DateTimeKind.Utc, timestamp.ToDateTime().Kind);
-        }
-
-        [Test]
-        public void Arithmetic()
-        {
-            Timestamp t1 = new Timestamp { Seconds = 10000, Nanos = 5000 };
-            Timestamp t2 = new Timestamp { Seconds = 8000, Nanos = 10000 };
-            Duration difference = new Duration { Seconds = 1999, Nanos = Duration.NanosecondsPerSecond - 5000 };
-            Assert.AreEqual(difference, t1 - t2);
-            Assert.AreEqual(-difference, t2 - t1);
-            
-            Assert.AreEqual(t1, t2 + difference);
-            Assert.AreEqual(t2, t1 - difference);
-        }
-
-        [Test]
-        public void ToString_NonNormalized()
-        {
-            // Just a single example should be sufficient...
-            var duration = new Timestamp { Seconds = 1, Nanos = -1 };
-            Assert.AreEqual("{ \"@warning\": \"Invalid Timestamp\", \"seconds\": \"1\", \"nanos\": -1 }", duration.ToString());
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs

@@ -1,421 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.IO;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class WrappersTest
-    {
-        [Test]
-        public void NullIsDefault()
-        {
-            var message = new TestWellKnownTypes();
-            Assert.IsNull(message.StringField);
-            Assert.IsNull(message.BytesField);
-            Assert.IsNull(message.BoolField);
-            Assert.IsNull(message.FloatField);
-            Assert.IsNull(message.DoubleField);
-            Assert.IsNull(message.Int32Field);
-            Assert.IsNull(message.Int64Field);
-            Assert.IsNull(message.Uint32Field);
-            Assert.IsNull(message.Uint64Field);
-        }
-
-        [Test]
-        public void NonDefaultSingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = TestWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual("x", parsed.StringField);
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), parsed.BytesField);
-            Assert.AreEqual(true, parsed.BoolField);
-            Assert.AreEqual(12.5f, parsed.FloatField);
-            Assert.AreEqual(12.25d, parsed.DoubleField);
-            Assert.AreEqual(1, parsed.Int32Field);
-            Assert.AreEqual(2L, parsed.Int64Field);
-            Assert.AreEqual(3U, parsed.Uint32Field);
-            Assert.AreEqual(4UL, parsed.Uint64Field);
-        }
-
-        [Test]
-        public void NonNullDefaultIsPreservedThroughSerialization()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = TestWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual("", parsed.StringField);
-            Assert.AreEqual(ByteString.Empty, parsed.BytesField);
-            Assert.AreEqual(false, parsed.BoolField);
-            Assert.AreEqual(0f, parsed.FloatField);
-            Assert.AreEqual(0d, parsed.DoubleField);
-            Assert.AreEqual(0, parsed.Int32Field);
-            Assert.AreEqual(0L, parsed.Int64Field);
-            Assert.AreEqual(0U, parsed.Uint32Field);
-            Assert.AreEqual(0UL, parsed.Uint64Field);
-        }
-
-        [Test]
-        public void RepeatedWrappersProhibitNullItems()
-        {
-            var message = new RepeatedWellKnownTypes();
-            Assert.Throws<ArgumentNullException>(() => message.BoolField.Add((bool?) null));
-            Assert.Throws<ArgumentNullException>(() => message.Int32Field.Add((int?) null));
-            Assert.Throws<ArgumentNullException>(() => message.StringField.Add((string) null));
-            Assert.Throws<ArgumentNullException>(() => message.BytesField.Add((ByteString) null));
-        }
-
-        [Test]
-        public void RepeatedWrappersSerializeDeserialize()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },                
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-            var bytes = message.ToByteArray();
-            var parsed = RepeatedWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual(message, parsed);
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[1]);
-        }
-
-        [Test]
-        public void RepeatedWrappersBinaryFormat()
-        {
-            // At one point we accidentally used a packed format for repeated wrappers, which is wrong (and weird).
-            // This test is just to prove that we use the right format.
-
-            var rawOutput = new MemoryStream();
-            var output = new CodedOutputStream(rawOutput);
-            // Write a value of 5
-            output.WriteTag(RepeatedWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(2);
-            output.WriteTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint);
-            output.WriteInt32(5);
-            // Write a value of 0 (empty message)
-            output.WriteTag(RepeatedWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(0);
-            output.Flush();
-            var expectedBytes = rawOutput.ToArray();
-
-            var message = new RepeatedWellKnownTypes { Int32Field = { 5, 0 } };
-            var actualBytes = message.ToByteArray();
-            Assert.AreEqual(expectedBytes, actualBytes);
-        }
-
-        [Test]
-        public void MapWrappersSerializeDeserialize()
-        {
-            // Note: no null values here, as they are prohibited in map fields
-            // (despite being representable).
-            var message = new MapWellKnownTypes
-            {
-                BoolField = { { 10, false }, { 20, true } },
-                BytesField = {
-                    { -1, ByteString.CopyFrom(1, 2, 3) },
-                    { 10, ByteString.CopyFrom(4, 5, 6) },
-                    { 1000, ByteString.Empty },
-                },
-                DoubleField = { { 1, 12.5 }, { 10, -1.5 }, { 20, 0d } },
-                FloatField = { { 2, 123.25f }, { 3, -20f }, { 4, 0f } },
-                Int32Field = { { 5, int.MaxValue }, { 6, int.MinValue }, { 7, 0 } },
-                Int64Field = { { 8, long.MaxValue }, { 9, long.MinValue }, { 10, 0L } },
-                StringField = { { 11, "First" }, { 12, "Second" }, { 13, "" } },
-                Uint32Field = { { 15, uint.MaxValue }, { 16, uint.MinValue }, { 17, 0U } },
-                Uint64Field = { { 18, ulong.MaxValue }, { 19, ulong.MinValue }, { 20, 0UL } },
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = MapWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual(message, parsed);
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[12]);
-        }
-
-        [Test]
-        public void Reflection_SingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            var fields = TestWellKnownTypes.Descriptor.Fields;
-
-            Assert.AreEqual("x", fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), fields[TestWellKnownTypes.BytesFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(true, fields[TestWellKnownTypes.BoolFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(12.5f, fields[TestWellKnownTypes.FloatFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(12.25d, fields[TestWellKnownTypes.DoubleFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(1, fields[TestWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(2L, fields[TestWellKnownTypes.Int64FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(3U, fields[TestWellKnownTypes.Uint32FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(4UL, fields[TestWellKnownTypes.Uint64FieldFieldNumber].Accessor.GetValue(message));
-
-            // And a couple of null fields...
-            message.StringField = null;
-            message.FloatField = null;
-            Assert.IsNull(fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.GetValue(message));
-            Assert.IsNull(fields[TestWellKnownTypes.FloatFieldFieldNumber].Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void Reflection_RepeatedFields()
-        {
-            // Just a single example... note that we can't have a null value here
-            var message = new RepeatedWellKnownTypes { Int32Field = { 1, 2 } };
-            var fields = RepeatedWellKnownTypes.Descriptor.Fields;
-            var list = (IList) fields[RepeatedWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message);
-            CollectionAssert.AreEqual(new[] { 1, 2 }, list);
-        }
-
-        [Test]
-        public void Reflection_MapFields()
-        {
-            // Just a single example... note that we can't have a null value here despite the value type being int?
-            var message = new MapWellKnownTypes { Int32Field = { { 1, 2 } } };
-            var fields = MapWellKnownTypes.Descriptor.Fields;
-            var dictionary = (IDictionary) fields[MapWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message);
-            Assert.AreEqual(2, dictionary[1]);
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new OneofWellKnownTypes { EmptyField = new Empty() };
-            // Start off with a non-wrapper
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.EmptyField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 0.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 1.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.ClearOneofField();
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-        }
-
-        private void AssertOneofRoundTrip(OneofWellKnownTypes message)
-        {
-            // Normal roundtrip, but explicitly checking the case...
-            var bytes = message.ToByteArray();
-            var parsed = OneofWellKnownTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-            Assert.AreEqual(message.OneofFieldCase, parsed.OneofFieldCase);
-        }
-
-        [Test]
-        [TestCase("x", "y", "y")]
-        [TestCase("x", "", "x")]
-        [TestCase("x", null, "x")]
-        [TestCase("", "y", "y")]
-        [TestCase("", "", "")]
-        [TestCase("", null, "")]
-        [TestCase(null, "y", "y")]
-        [TestCase(null, "", "")]
-        [TestCase(null, null, null)]
-        public void Merging(string original, string merged, string expected)
-        {
-            var originalMessage = new TestWellKnownTypes { StringField = original };
-            var mergingMessage = new TestWellKnownTypes { StringField = merged };
-            originalMessage.MergeFrom(mergingMessage);
-            Assert.AreEqual(expected, originalMessage.StringField);
-
-            // Try it using MergeFrom(CodedInputStream) too...
-            originalMessage = new TestWellKnownTypes { StringField = original };
-            originalMessage.MergeFrom(mergingMessage.ToByteArray());
-            Assert.AreEqual(expected, originalMessage.StringField);
-        }
-
-        // Merging is odd with wrapper types, due to the way that default values aren't emitted in
-        // the binary stream. In fact we cheat a little bit - a message with an explicitly present default
-        // value will have that default value ignored. See issue 615. Fixing this would require significant upheaval to
-        // the FieldCodec side of things.
-        [Test]
-        public void MergingStreamExplicitValue()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which has the data of an Int32Value explicitly containing a value of 0.
-            // This wouldn't normally happen.
-            byte[] bytes;
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-            using (var stream = new MemoryStream())
-            {
-                var coded = new CodedOutputStream(stream);
-                coded.WriteTag(wrapperTag);
-                coded.WriteLength(2); // valueTag + a value 0, each one byte
-                coded.WriteTag(valueTag);
-                coded.WriteInt32(0);
-                coded.Flush();
-                bytes = stream.ToArray();
-            }
-
-            message.MergeFrom(bytes);
-            // A normal implementation would have 0 now, as the explicit default would have been overwritten the 5.
-            // With the FieldCodec for Nullable<int>, we can't tell the difference between an implicit 0 and an explicit 0.
-            Assert.AreEqual(5, message.Int32Field);
-        }
-
-        [Test]
-        public void MergingStreamNoValue()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which an Int32 field, but with no value.
-            var bytes = new TestWellKnownTypes { Int32Field = 0 }.ToByteArray();
-            Assert.AreEqual(2, bytes.Length); // The tag for Int32Field is a single byte, then a byte indicating a 0-length message.
-            message.MergeFrom(bytes);
-
-            // The "implicit" 0 did *not* overwrite the value.
-            // (This is the correct behaviour.)
-            Assert.AreEqual(5, message.Int32Field);
-        }
-
-        // All permutations of origin/merging value being null, zero (default) or non-default.
-        // As this is the in-memory version, we don't need to worry about the difference between implicit and explicit 0.
-        [Test]
-        [TestCase(null, null, null)]
-        [TestCase(null, 0, 0)]
-        [TestCase(null, 5, 5)]
-        [TestCase(0, null, 0)]
-        [TestCase(0, 0, 0)]
-        [TestCase(0, 5, 5)]
-        [TestCase(5, null, 5)]
-        [TestCase(5, 0, 5)]
-        [TestCase(5, 10, 10)]
-        public void MergingMessageWithZero(int? originValue, int? mergingValue, int? expectedResult)
-        {
-            // This differs from the MergingStreamCornerCase because when we merge message *objects*,
-            // we ignore default values from the "source".
-            var message1 = new TestWellKnownTypes { Int32Field = originValue };
-            var message2 = new TestWellKnownTypes { Int32Field = mergingValue };
-            message1.MergeFrom(message2);
-            Assert.AreEqual(expectedResult, message1.Int32Field);
-        }
-
-        [Test]
-        public void UnknownFieldInWrapper()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var unknownTag = WireFormat.MakeTag(15, WireFormat.WireType.Varint);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-
-            output.WriteTag(wrapperTag);
-            output.WriteLength(4); // unknownTag + value 5 + valueType + value 6, each 1 byte
-            output.WriteTag(unknownTag);
-            output.WriteInt32((int) valueTag); // Sneakily "pretend" it's a tag when it's really a value
-            output.WriteTag(valueTag);
-            output.WriteInt32(6);
-
-            output.Flush();
-            stream.Position = 0;
-            
-            var message = TestWellKnownTypes.Parser.ParseFrom(stream);
-            Assert.AreEqual(6, message.Int32Field);
-        }
-
-        [Test]
-        public void ClearWithReflection()
-        {
-            // String and Bytes are the tricky ones here, as the CLR type of the property
-            // is the same between the wrapper and non-wrapper types.
-            var message = new TestWellKnownTypes { StringField = "foo" };
-            TestWellKnownTypes.Descriptor.Fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.Clear(message);
-            Assert.IsNull(message.StringField);
-        }
-    }
-}

csharp/src/Google.Protobuf.Test/project.json

@@ -1,44 +0,0 @@
-{
-  "buildOptions": {
-    "debugType": "portable",
-    "keyFile": "../../keys/Google.Protobuf.snk"
-  },
-
-  "configurations": {
-    "Debug": {
-      "buildOptions": {
-        "define": [ "DEBUG", "TRACE" ]
-      }
-    },
-    "Release": {
-      "buildOptions": {
-        "define": [ "RELEASE", "TRACE" ],
-        "optimize": true
-      }
-    }
-  },
-
-  "dependencies": {
-    "Google.Protobuf": { "target": "project" },
-    "NUnit": "3.4.0",
-    "dotnet-test-nunit": "3.4.0-alpha-2",
-  },
-
-  "testRunner": "nunit",
-
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports" : [ "dnxcore50", "netcoreapp1.0", "portable-net45+win8" ],
-      "buildOptions": {
-        "define": [ "PCL" ]
-      },
-      "dependencies": {
-        "Microsoft.NETCore.App": { 
-          "version": "1.0.0",
-          "type": "platform"
-        },
-        "System.Console": "4.0.0"
-      }
-    }
-  }
-}

csharp/src/Google.Protobuf.sln

@@ -1,45 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 14.0.24720.0
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AddressBook", "AddressBook\AddressBook.xproj", "{AFB63919-1E05-43B4-802A-8FB8C9B2F463}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Google.Protobuf", "Google.Protobuf\Google.Protobuf.xproj", "{9B576380-726D-4142-8238-60A43AB0E35A}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Google.Protobuf.Test", "Google.Protobuf.Test\Google.Protobuf.Test.xproj", "{580EB013-D3C7-4578-B845-015F4A3B0591}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Google.Protobuf.Conformance", "Google.Protobuf.Conformance\Google.Protobuf.Conformance.xproj", "{DDDC055B-E185-4181-BAB0-072F0F984569}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Google.Protobuf.JsonDump", "Google.Protobuf.JsonDump\Google.Protobuf.JsonDump.xproj", "{9695E08F-9829-497D-B95C-B38F28D48690}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

csharp/src/Google.Protobuf/ByteArray.cs

@@ -1,79 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Provides a utility routine to copy small arrays much more quickly than Buffer.BlockCopy
-    /// </summary>
-    internal static class ByteArray
-    {
-        /// <summary>
-        /// The threshold above which you should use Buffer.BlockCopy rather than ByteArray.Copy
-        /// </summary>
-        private const int CopyThreshold = 12;
-
-        /// <summary>
-        /// Determines which copy routine to use based on the number of bytes to be copied.
-        /// </summary>
-        internal static void Copy(byte[] src, int srcOffset, byte[] dst, int dstOffset, int count)
-        {
-            if (count > CopyThreshold)
-            {
-                Buffer.BlockCopy(src, srcOffset, dst, dstOffset, count);
-            }
-            else
-            {
-                int stop = srcOffset + count;
-                for (int i = srcOffset; i < stop; i++)
-                {
-                    dst[dstOffset++] = src[i];
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reverses the order of bytes in the array
-        /// </summary>
-        internal static void Reverse(byte[] bytes)
-        {
-            for (int first = 0, last = bytes.Length - 1; first < last; first++, last--)
-            {
-                byte temp = bytes[first];
-                bytes[first] = bytes[last];
-                bytes[last] = temp;
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf/ByteString.cs

@@ -1,345 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Immutable array of bytes.
-    /// </summary>
-    public sealed class ByteString : IEnumerable<byte>, IEquatable<ByteString>
-    {
-        private static readonly ByteString empty = new ByteString(new byte[0]);
-
-        private readonly byte[] bytes;
-
-        /// <summary>
-        /// Unsafe operations that can cause IO Failure and/or other catestrophic side-effects.
-        /// </summary>
-        internal static class Unsafe
-        {
-            /// <summary>
-            /// Constructs a new ByteString from the given byte array. The array is
-            /// *not* copied, and must not be modified after this constructor is called.
-            /// </summary>
-            internal static ByteString FromBytes(byte[] bytes)
-            {
-                return new ByteString(bytes);
-            }
-
-            /// <summary>
-            /// Provides direct, unrestricted access to the bytes contained in this instance.
-            /// You must not modify or resize the byte array returned by this method.
-            /// </summary>
-            internal static byte[] GetBuffer(ByteString bytes)
-            {
-                return bytes.bytes;
-            }
-        }
-
-        /// <summary>
-        /// Internal use only.  Ensure that the provided array is not mutated and belongs to this instance.
-        /// </summary>
-        internal static ByteString AttachBytes(byte[] bytes)
-        {
-            return new ByteString(bytes);
-        }
-
-        /// <summary>
-        /// Constructs a new ByteString from the given byte array. The array is
-        /// *not* copied, and must not be modified after this constructor is called.
-        /// </summary>
-        private ByteString(byte[] bytes)
-        {
-            this.bytes = bytes;
-        }
-
-        /// <summary>
-        /// Returns an empty ByteString.
-        /// </summary>
-        public static ByteString Empty
-        {
-            get { return empty; }
-        }
-
-        /// <summary>
-        /// Returns the length of this ByteString in bytes.
-        /// </summary>
-        public int Length
-        {
-            get { return bytes.Length; }
-        }
-
-        /// <summary>
-        /// Returns <c>true</c> if this byte string is empty, <c>false</c> otherwise.
-        /// </summary>
-        public bool IsEmpty
-        {
-            get { return Length == 0; }
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a byte array.
-        /// </summary>
-        /// <remarks>The data is copied - changes to the returned array will not be reflected in this <c>ByteString</c>.</remarks>
-        /// <returns>A byte array with the same data as this <c>ByteString</c>.</returns>
-        public byte[] ToByteArray()
-        {
-            return (byte[]) bytes.Clone();
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a standard base64 representation.
-        /// </summary>
-        /// <returns>A base64 representation of this <c>ByteString</c>.</returns>
-        public string ToBase64()
-        {
-            return Convert.ToBase64String(bytes);
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from the Base64 Encoded String.
-        /// </summary>
-        public static ByteString FromBase64(string bytes)
-        {
-            // By handling the empty string explicitly, we not only optimize but we fix a
-            // problem on CF 2.0. See issue 61 for details.
-            return bytes == "" ? Empty : new ByteString(Convert.FromBase64String(bytes));
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from the given array. The contents
-        /// are copied, so further modifications to the array will not
-        /// be reflected in the returned ByteString.
-        /// This method can also be invoked in <c>ByteString.CopyFrom(0xaa, 0xbb, ...)</c> form
-        /// which is primarily useful for testing.
-        /// </summary>
-        public static ByteString CopyFrom(params byte[] bytes)
-        {
-            return new ByteString((byte[]) bytes.Clone());
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from a portion of a byte array.
-        /// </summary>
-        public static ByteString CopyFrom(byte[] bytes, int offset, int count)
-        {
-            byte[] portion = new byte[count];
-            ByteArray.Copy(bytes, offset, portion, 0, count);
-            return new ByteString(portion);
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="ByteString" /> by encoding the specified text with
-        /// the given encoding.
-        /// </summary>
-        public static ByteString CopyFrom(string text, Encoding encoding)
-        {
-            return new ByteString(encoding.GetBytes(text));
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="ByteString" /> by encoding the specified text in UTF-8.
-        /// </summary>
-        public static ByteString CopyFromUtf8(string text)
-        {
-            return CopyFrom(text, Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Retuns the byte at the given index.
-        /// </summary>
-        public byte this[int index]
-        {
-            get { return bytes[index]; }
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a string by applying the given encoding.
-        /// </summary>
-        /// <remarks>
-        /// This method should only be used to convert binary data which was the result of encoding
-        /// text with the given encoding.
-        /// </remarks>
-        /// <param name="encoding">The encoding to use to decode the binary data into text.</param>
-        /// <returns>The result of decoding the binary data with the given decoding.</returns>
-        public string ToString(Encoding encoding)
-        {
-            return encoding.GetString(bytes, 0, bytes.Length);
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a string by applying the UTF-8 encoding.
-        /// </summary>
-        /// <remarks>
-        /// This method should only be used to convert binary data which was the result of encoding
-        /// text with UTF-8.
-        /// </remarks>
-        /// <returns>The result of decoding the binary data with the given decoding.</returns>
-        public string ToStringUtf8()
-        {
-            return ToString(Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Returns an iterator over the bytes in this <see cref="ByteString"/>.
-        /// </summary>
-        /// <returns>An iterator over the bytes in this object.</returns>
-        public IEnumerator<byte> GetEnumerator()
-        {
-            return ((IEnumerable<byte>) bytes).GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns an iterator over the bytes in this <see cref="ByteString"/>.
-        /// </summary>
-        /// <returns>An iterator over the bytes in this object.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Creates a CodedInputStream from this ByteString's data.
-        /// </summary>
-        public CodedInputStream CreateCodedInput()
-        {
-            // We trust CodedInputStream not to reveal the provided byte array or modify it
-            return new CodedInputStream(bytes);
-        }
-
-        /// <summary>
-        /// Compares two byte strings for equality.
-        /// </summary>
-        /// <param name="lhs">The first byte string to compare.</param>
-        /// <param name="rhs">The second byte string to compare.</param>
-        /// <returns><c>true</c> if the byte strings are equal; false otherwise.</returns>
-        public static bool operator ==(ByteString lhs, ByteString rhs)
-        {
-            if (ReferenceEquals(lhs, rhs))
-            {
-                return true;
-            }
-            if (ReferenceEquals(lhs, null) || ReferenceEquals(rhs, null))
-            {
-                return false;
-            }
-            if (lhs.bytes.Length != rhs.bytes.Length)
-            {
-                return false;
-            }
-            for (int i = 0; i < lhs.Length; i++)
-            {
-                if (rhs.bytes[i] != lhs.bytes[i])
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Compares two byte strings for inequality.
-        /// </summary>
-        /// <param name="lhs">The first byte string to compare.</param>
-        /// <param name="rhs">The second byte string to compare.</param>
-        /// <returns><c>false</c> if the byte strings are equal; true otherwise.</returns>
-        public static bool operator !=(ByteString lhs, ByteString rhs)
-        {
-            return !(lhs == rhs);
-        }
-
-        /// <summary>
-        /// Compares this byte string with another object.
-        /// </summary>
-        /// <param name="obj">The object to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="obj"/> refers to an equal <see cref="ByteString"/>; <c>false</c> otherwise.</returns>
-        public override bool Equals(object obj)
-        {
-            return this == (obj as ByteString);
-        }
-
-        /// <summary>
-        /// Returns a hash code for this object. Two equal byte strings
-        /// will return the same hash code.
-        /// </summary>
-        /// <returns>A hash code for this object.</returns>
-        public override int GetHashCode()
-        {
-            int ret = 23;
-            foreach (byte b in bytes)
-            {
-                ret = (ret << 8) | b;
-            }
-            return ret;
-        }
-
-        /// <summary>
-        /// Compares this byte string with another.
-        /// </summary>
-        /// <param name="other">The <see cref="ByteString"/> to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="other"/> refers to an equal byte string; <c>false</c> otherwise.</returns>
-        public bool Equals(ByteString other)
-        {
-            return this == other;
-        }
-
-        /// <summary>
-        /// Used internally by CodedOutputStream to avoid creating a copy for the write
-        /// </summary>
-        internal void WriteRawBytesTo(CodedOutputStream outputStream)
-        {
-            outputStream.WriteRawBytes(bytes, 0, bytes.Length);
-        }
-
-        /// <summary>
-        /// Copies the entire byte array to the destination array provided at the offset specified.
-        /// </summary>
-        public void CopyTo(byte[] array, int position)
-        {
-            ByteArray.Copy(bytes, 0, array, position, bytes.Length);
-        }
-
-        /// <summary>
-        /// Writes the entire byte array to the provided stream
-        /// </summary>
-        public void WriteTo(Stream outputStream)
-        {
-            outputStream.Write(bytes, 0, bytes.Length);
-        }
-    }
-}

csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs

@@ -1,304 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    // This part of CodedOutputStream provides all the static entry points that are used
-    // by generated code and internally to compute the size of messages prior to being
-    // written to an instance of CodedOutputStream.
-    public sealed partial class CodedOutputStream
-    {
-        private const int LittleEndian64Size = 8;
-        private const int LittleEndian32Size = 4;        
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// double field, including the tag.
-        /// </summary>
-        public static int ComputeDoubleSize(double value)
-        {
-            return LittleEndian64Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// float field, including the tag.
-        /// </summary>
-        public static int ComputeFloatSize(float value)
-        {
-            return LittleEndian32Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// uint64 field, including the tag.
-        /// </summary>
-        public static int ComputeUInt64Size(ulong value)
-        {
-            return ComputeRawVarint64Size(value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// int64 field, including the tag.
-        /// </summary>
-        public static int ComputeInt64Size(long value)
-        {
-            return ComputeRawVarint64Size((ulong) value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// int32 field, including the tag.
-        /// </summary>
-        public static int ComputeInt32Size(int value)
-        {
-            if (value >= 0)
-            {
-                return ComputeRawVarint32Size((uint) value);
-            }
-            else
-            {
-                // Must sign-extend.
-                return 10;
-            }
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// fixed64 field, including the tag.
-        /// </summary>
-        public static int ComputeFixed64Size(ulong value)
-        {
-            return LittleEndian64Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// fixed32 field, including the tag.
-        /// </summary>
-        public static int ComputeFixed32Size(uint value)
-        {
-            return LittleEndian32Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// bool field, including the tag.
-        /// </summary>
-        public static int ComputeBoolSize(bool value)
-        {
-            return 1;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// string field, including the tag.
-        /// </summary>
-        public static int ComputeStringSize(String value)
-        {
-            int byteArraySize = Utf8Encoding.GetByteCount(value);
-            return ComputeLengthSize(byteArraySize) + byteArraySize;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// group field, including the tag.
-        /// </summary>
-        public static int ComputeGroupSize(IMessage value)
-        {
-            return value.CalculateSize();
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// embedded message field, including the tag.
-        /// </summary>
-        public static int ComputeMessageSize(IMessage value)
-        {
-            int size = value.CalculateSize();
-            return ComputeLengthSize(size) + size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// bytes field, including the tag.
-        /// </summary>
-        public static int ComputeBytesSize(ByteString value)
-        {
-            return ComputeLengthSize(value.Length) + value.Length;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// uint32 field, including the tag.
-        /// </summary>
-        public static int ComputeUInt32Size(uint value)
-        {
-            return ComputeRawVarint32Size(value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// enum field, including the tag. The caller is responsible for
-        /// converting the enum value to its numeric value.
-        /// </summary>
-        public static int ComputeEnumSize(int value)
-        {
-            // Currently just a pass-through, but it's nice to separate it logically.
-            return ComputeInt32Size(value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sfixed32 field, including the tag.
-        /// </summary>
-        public static int ComputeSFixed32Size(int value)
-        {
-            return LittleEndian32Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sfixed64 field, including the tag.
-        /// </summary>
-        public static int ComputeSFixed64Size(long value)
-        {
-            return LittleEndian64Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sint32 field, including the tag.
-        /// </summary>
-        public static int ComputeSInt32Size(int value)
-        {
-            return ComputeRawVarint32Size(EncodeZigZag32(value));
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sint64 field, including the tag.
-        /// </summary>
-        public static int ComputeSInt64Size(long value)
-        {
-            return ComputeRawVarint64Size(EncodeZigZag64(value));
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a length,
-        /// as written by <see cref="WriteLength"/>.
-        /// </summary>
-        public static int ComputeLengthSize(int length)
-        {
-            return ComputeRawVarint32Size((uint) length);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a varint.
-        /// </summary>
-        public static int ComputeRawVarint32Size(uint value)
-        {
-            if ((value & (0xffffffff << 7)) == 0)
-            {
-                return 1;
-            }
-            if ((value & (0xffffffff << 14)) == 0)
-            {
-                return 2;
-            }
-            if ((value & (0xffffffff << 21)) == 0)
-            {
-                return 3;
-            }
-            if ((value & (0xffffffff << 28)) == 0)
-            {
-                return 4;
-            }
-            return 5;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a varint.
-        /// </summary>
-        public static int ComputeRawVarint64Size(ulong value)
-        {
-            if ((value & (0xffffffffffffffffL << 7)) == 0)
-            {
-                return 1;
-            }
-            if ((value & (0xffffffffffffffffL << 14)) == 0)
-            {
-                return 2;
-            }
-            if ((value & (0xffffffffffffffffL << 21)) == 0)
-            {
-                return 3;
-            }
-            if ((value & (0xffffffffffffffffL << 28)) == 0)
-            {
-                return 4;
-            }
-            if ((value & (0xffffffffffffffffL << 35)) == 0)
-            {
-                return 5;
-            }
-            if ((value & (0xffffffffffffffffL << 42)) == 0)
-            {
-                return 6;
-            }
-            if ((value & (0xffffffffffffffffL << 49)) == 0)
-            {
-                return 7;
-            }
-            if ((value & (0xffffffffffffffffL << 56)) == 0)
-            {
-                return 8;
-            }
-            if ((value & (0xffffffffffffffffL << 63)) == 0)
-            {
-                return 9;
-            }
-            return 10;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a tag.
-        /// </summary>
-        public static int ComputeTagSize(int fieldNumber)
-        {
-            return ComputeRawVarint32Size(WireFormat.MakeTag(fieldNumber, 0));
-        }
-    }
-}

csharp/src/Google.Protobuf/CodedOutputStream.cs

@@ -1,761 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.IO;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Encodes and writes protocol message fields.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This class is generally used by generated code to write appropriate
-    /// primitives to the stream. It effectively encapsulates the lowest
-    /// levels of protocol buffer format. Unlike some other implementations,
-    /// this does not include combined "write tag and value" methods. Generated
-    /// code knows the exact byte representations of the tags they're going to write,
-    /// so there's no need to re-encode them each time. Manually-written code calling
-    /// this class should just call one of the <c>WriteTag</c> overloads before each value.
-    /// </para>
-    /// <para>
-    /// Repeated fields and map fields are not handled by this class; use <c>RepeatedField&lt;T&gt;</c>
-    /// and <c>MapField&lt;TKey, TValue&gt;</c> to serialize such fields.
-    /// </para>
-    /// </remarks>
-    public sealed partial class CodedOutputStream : IDisposable
-    {
-        // "Local" copy of Encoding.UTF8, for efficiency. (Yes, it makes a difference.)
-        internal static readonly Encoding Utf8Encoding = Encoding.UTF8;
-
-        /// <summary>
-        /// The buffer size used by CreateInstance(Stream).
-        /// </summary>
-        public static readonly int DefaultBufferSize = 4096;
-
-        private readonly bool leaveOpen;
-        private readonly byte[] buffer;
-        private readonly int limit;
-        private int position;
-        private readonly Stream output;
-
-        #region Construction
-        /// <summary>
-        /// Creates a new CodedOutputStream that writes directly to the given
-        /// byte array. If more bytes are written than fit in the array,
-        /// OutOfSpaceException will be thrown.
-        /// </summary>
-        public CodedOutputStream(byte[] flatArray) : this(flatArray, 0, flatArray.Length)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream that writes directly to the given
-        /// byte array slice. If more bytes are written than fit in the array,
-        /// OutOfSpaceException will be thrown.
-        /// </summary>
-        private CodedOutputStream(byte[] buffer, int offset, int length)
-        {
-            this.output = null;
-            this.buffer = buffer;
-            this.position = offset;
-            this.limit = offset + length;
-            leaveOpen = true; // Simple way of avoiding trying to dispose of a null reference
-        }
-
-        private CodedOutputStream(Stream output, byte[] buffer, bool leaveOpen)
-        {
-            this.output = ProtoPreconditions.CheckNotNull(output, nameof(output));
-            this.buffer = buffer;
-            this.position = 0;
-            this.limit = buffer.Length;
-            this.leaveOpen = leaveOpen;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="CodedOutputStream" /> which write to the given stream, and disposes of that
-        /// stream when the returned <c>CodedOutputStream</c> is disposed.
-        /// </summary>
-        /// <param name="output">The stream to write to. It will be disposed when the returned <c>CodedOutputStream is disposed.</c></param>
-        public CodedOutputStream(Stream output) : this(output, DefaultBufferSize, false)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream which write to the given stream and uses
-        /// the specified buffer size.
-        /// </summary>
-        /// <param name="output">The stream to write to. It will be disposed when the returned <c>CodedOutputStream is disposed.</c></param>
-        /// <param name="bufferSize">The size of buffer to use internally.</param>
-        public CodedOutputStream(Stream output, int bufferSize) : this(output, new byte[bufferSize], false)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream which write to the given stream.
-        /// </summary>
-        /// <param name="output">The stream to write to.</param>
-        /// <param name="leaveOpen">If <c>true</c>, <paramref name="output"/> is left open when the returned <c>CodedOutputStream</c> is disposed;
-        /// if <c>false</c>, the provided stream is disposed as well.</param>
-        public CodedOutputStream(Stream output, bool leaveOpen) : this(output, DefaultBufferSize, leaveOpen)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream which write to the given stream and uses
-        /// the specified buffer size.
-        /// </summary>
-        /// <param name="output">The stream to write to.</param>
-        /// <param name="bufferSize">The size of buffer to use internally.</param>
-        /// <param name="leaveOpen">If <c>true</c>, <paramref name="output"/> is left open when the returned <c>CodedOutputStream</c> is disposed;
-        /// if <c>false</c>, the provided stream is disposed as well.</param>
-        public CodedOutputStream(Stream output, int bufferSize, bool leaveOpen) : this(output, new byte[bufferSize], leaveOpen)
-        {
-        }
-        #endregion
-
-        /// <summary>
-        /// Returns the current position in the stream, or the position in the output buffer
-        /// </summary>
-        public long Position
-        {
-            get
-            {
-                if (output != null)
-                {
-                    return output.Position + position;
-                }
-                return position;
-            }
-        }
-
-        #region Writing of values (not including tags)
-
-        /// <summary>
-        /// Writes a double field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteDouble(double value)
-        {
-            WriteRawLittleEndian64((ulong)BitConverter.DoubleToInt64Bits(value));
-        }
-
-        /// <summary>
-        /// Writes a float field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFloat(float value)
-        {
-            byte[] rawBytes = BitConverter.GetBytes(value);
-            if (!BitConverter.IsLittleEndian)
-            {
-                ByteArray.Reverse(rawBytes);
-            }
-
-            if (limit - position >= 4)
-            {
-                buffer[position++] = rawBytes[0];
-                buffer[position++] = rawBytes[1];
-                buffer[position++] = rawBytes[2];
-                buffer[position++] = rawBytes[3];
-            }
-            else
-            {
-                WriteRawBytes(rawBytes, 0, 4);
-            }
-        }
-
-        /// <summary>
-        /// Writes a uint64 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteUInt64(ulong value)
-        {
-            WriteRawVarint64(value);
-        }
-
-        /// <summary>
-        /// Writes an int64 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteInt64(long value)
-        {
-            WriteRawVarint64((ulong) value);
-        }
-
-        /// <summary>
-        /// Writes an int32 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteInt32(int value)
-        {
-            if (value >= 0)
-            {
-                WriteRawVarint32((uint) value);
-            }
-            else
-            {
-                // Must sign-extend.
-                WriteRawVarint64((ulong) value);
-            }
-        }
-
-        /// <summary>
-        /// Writes a fixed64 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFixed64(ulong value)
-        {
-            WriteRawLittleEndian64(value);
-        }
-
-        /// <summary>
-        /// Writes a fixed32 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFixed32(uint value)
-        {
-            WriteRawLittleEndian32(value);
-        }
-
-        /// <summary>
-        /// Writes a bool field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteBool(bool value)
-        {
-            WriteRawByte(value ? (byte) 1 : (byte) 0);
-        }
-
-        /// <summary>
-        /// Writes a string field value, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteString(string value)
-        {
-            // Optimise the case where we have enough space to write
-            // the string directly to the buffer, which should be common.
-            int length = Utf8Encoding.GetByteCount(value);
-            WriteLength(length);
-            if (limit - position >= length)
-            {
-                if (length == value.Length) // Must be all ASCII...
-                {
-                    for (int i = 0; i < length; i++)
-                    {
-                        buffer[position + i] = (byte)value[i];
-                    }
-                }
-                else
-                {
-                    Utf8Encoding.GetBytes(value, 0, value.Length, buffer, position);
-                }
-                position += length;
-            }
-            else
-            {
-                byte[] bytes = Utf8Encoding.GetBytes(value);
-                WriteRawBytes(bytes);
-            }
-        }
-
-        /// <summary>
-        /// Writes a message, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteMessage(IMessage value)
-        {
-            WriteLength(value.CalculateSize());
-            value.WriteTo(this);
-        }
-
-        /// <summary>
-        /// Write a byte string, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteBytes(ByteString value)
-        {
-            WriteLength(value.Length);
-            value.WriteRawBytesTo(this);
-        }
-
-        /// <summary>
-        /// Writes a uint32 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteUInt32(uint value)
-        {
-            WriteRawVarint32(value);
-        }
-
-        /// <summary>
-        /// Writes an enum value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteEnum(int value)
-        {
-            WriteInt32(value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed32 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write.</param>
-        public void WriteSFixed32(int value)
-        {
-            WriteRawLittleEndian32((uint) value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed64 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSFixed64(long value)
-        {
-            WriteRawLittleEndian64((ulong) value);
-        }
-
-        /// <summary>
-        /// Writes an sint32 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSInt32(int value)
-        {
-            WriteRawVarint32(EncodeZigZag32(value));
-        }
-
-        /// <summary>
-        /// Writes an sint64 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSInt64(long value)
-        {
-            WriteRawVarint64(EncodeZigZag64(value));
-        }
-
-        /// <summary>
-        /// Writes a length (in bytes) for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This method simply writes a rawint, but exists for clarity in calling code.
-        /// </remarks>
-        /// <param name="length">Length value, in bytes.</param>
-        public void WriteLength(int length)
-        {
-            WriteRawVarint32((uint) length);
-        }
-
-        #endregion
-
-        #region Raw tag writing
-        /// <summary>
-        /// Encodes and writes a tag.
-        /// </summary>
-        /// <param name="fieldNumber">The number of the field to write the tag for</param>
-        /// <param name="type">The wire format type of the tag to write</param>
-        public void WriteTag(int fieldNumber, WireFormat.WireType type)
-        {
-            WriteRawVarint32(WireFormat.MakeTag(fieldNumber, type));
-        }
-
-        /// <summary>
-        /// Writes an already-encoded tag.
-        /// </summary>
-        /// <param name="tag">The encoded tag</param>
-        public void WriteTag(uint tag)
-        {
-            WriteRawVarint32(tag);
-        }
-
-        /// <summary>
-        /// Writes the given single-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The encoded tag</param>
-        public void WriteRawTag(byte b1)
-        {
-            WriteRawByte(b1);
-        }
-
-        /// <summary>
-        /// Writes the given two-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2)
-        {
-            WriteRawByte(b1);
-            WriteRawByte(b2);
-        }
-
-        /// <summary>
-        /// Writes the given three-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3)
-        {
-            WriteRawByte(b1);
-            WriteRawByte(b2);
-            WriteRawByte(b3);
-        }
-
-        /// <summary>
-        /// Writes the given four-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        /// <param name="b4">The fourth byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3, byte b4)
-        {
-            WriteRawByte(b1);
-            WriteRawByte(b2);
-            WriteRawByte(b3);
-            WriteRawByte(b4);
-        }
-
-        /// <summary>
-        /// Writes the given five-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        /// <param name="b4">The fourth byte of the encoded tag</param>
-        /// <param name="b5">The fifth byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3, byte b4, byte b5)
-        {
-            WriteRawByte(b1);
-            WriteRawByte(b2);
-            WriteRawByte(b3);
-            WriteRawByte(b4);
-            WriteRawByte(b5);
-        }
-        #endregion
-
-        #region Underlying writing primitives
-        /// <summary>
-        /// Writes a 32 bit value as a varint. The fast route is taken when
-        /// there's enough buffer space left to whizz through without checking
-        /// for each byte; otherwise, we resort to calling WriteRawByte each time.
-        /// </summary>
-        internal void WriteRawVarint32(uint value)
-        {
-            // Optimize for the common case of a single byte value
-            if (value < 128 && position < limit)
-            {
-                buffer[position++] = (byte)value;
-                return;
-            }
-
-            while (value > 127 && position < limit)
-            {
-                buffer[position++] = (byte) ((value & 0x7F) | 0x80);
-                value >>= 7;
-            }
-            while (value > 127)
-            {
-                WriteRawByte((byte) ((value & 0x7F) | 0x80));
-                value >>= 7;
-            }
-            if (position < limit)
-            {
-                buffer[position++] = (byte) value;
-            }
-            else
-            {
-                WriteRawByte((byte) value);
-            }
-        }
-
-        internal void WriteRawVarint64(ulong value)
-        {
-            while (value > 127 && position < limit)
-            {
-                buffer[position++] = (byte) ((value & 0x7F) | 0x80);
-                value >>= 7;
-            }
-            while (value > 127)
-            {
-                WriteRawByte((byte) ((value & 0x7F) | 0x80));
-                value >>= 7;
-            }
-            if (position < limit)
-            {
-                buffer[position++] = (byte) value;
-            }
-            else
-            {
-                WriteRawByte((byte) value);
-            }
-        }
-
-        internal void WriteRawLittleEndian32(uint value)
-        {
-            if (position + 4 > limit)
-            {
-                WriteRawByte((byte) value);
-                WriteRawByte((byte) (value >> 8));
-                WriteRawByte((byte) (value >> 16));
-                WriteRawByte((byte) (value >> 24));
-            }
-            else
-            {
-                buffer[position++] = ((byte) value);
-                buffer[position++] = ((byte) (value >> 8));
-                buffer[position++] = ((byte) (value >> 16));
-                buffer[position++] = ((byte) (value >> 24));
-            }
-        }
-
-        internal void WriteRawLittleEndian64(ulong value)
-        {
-            if (position + 8 > limit)
-            {
-                WriteRawByte((byte) value);
-                WriteRawByte((byte) (value >> 8));
-                WriteRawByte((byte) (value >> 16));
-                WriteRawByte((byte) (value >> 24));
-                WriteRawByte((byte) (value >> 32));
-                WriteRawByte((byte) (value >> 40));
-                WriteRawByte((byte) (value >> 48));
-                WriteRawByte((byte) (value >> 56));
-            }
-            else
-            {
-                buffer[position++] = ((byte) value);
-                buffer[position++] = ((byte) (value >> 8));
-                buffer[position++] = ((byte) (value >> 16));
-                buffer[position++] = ((byte) (value >> 24));
-                buffer[position++] = ((byte) (value >> 32));
-                buffer[position++] = ((byte) (value >> 40));
-                buffer[position++] = ((byte) (value >> 48));
-                buffer[position++] = ((byte) (value >> 56));
-            }
-        }
-
-        internal void WriteRawByte(byte value)
-        {
-            if (position == limit)
-            {
-                RefreshBuffer();
-            }
-
-            buffer[position++] = value;
-        }
-
-        internal void WriteRawByte(uint value)
-        {
-            WriteRawByte((byte) value);
-        }
-
-        /// <summary>
-        /// Writes out an array of bytes.
-        /// </summary>
-        internal void WriteRawBytes(byte[] value)
-        {
-            WriteRawBytes(value, 0, value.Length);
-        }
-
-        /// <summary>
-        /// Writes out part of an array of bytes.
-        /// </summary>
-        internal void WriteRawBytes(byte[] value, int offset, int length)
-        {
-            if (limit - position >= length)
-            {
-                ByteArray.Copy(value, offset, buffer, position, length);
-                // We have room in the current buffer.
-                position += length;
-            }
-            else
-            {
-                // Write extends past current buffer.  Fill the rest of this buffer and
-                // flush.
-                int bytesWritten = limit - position;
-                ByteArray.Copy(value, offset, buffer, position, bytesWritten);
-                offset += bytesWritten;
-                length -= bytesWritten;
-                position = limit;
-                RefreshBuffer();
-
-                // Now deal with the rest.
-                // Since we have an output stream, this is our buffer
-                // and buffer offset == 0
-                if (length <= limit)
-                {
-                    // Fits in new buffer.
-                    ByteArray.Copy(value, offset, buffer, 0, length);
-                    position = length;
-                }
-                else
-                {
-                    // Write is very big.  Let's do it all at once.
-                    output.Write(value, offset, length);
-                }
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Encode a 32-bit value with ZigZag encoding.
-        /// </summary>
-        /// <remarks>
-        /// ZigZag encodes signed integers into values that can be efficiently
-        /// encoded with varint.  (Otherwise, negative values must be 
-        /// sign-extended to 64 bits to be varint encoded, thus always taking
-        /// 10 bytes on the wire.)
-        /// </remarks>
-        internal static uint EncodeZigZag32(int n)
-        {
-            // Note:  the right-shift must be arithmetic
-            return (uint) ((n << 1) ^ (n >> 31));
-        }
-
-        /// <summary>
-        /// Encode a 64-bit value with ZigZag encoding.
-        /// </summary>
-        /// <remarks>
-        /// ZigZag encodes signed integers into values that can be efficiently
-        /// encoded with varint.  (Otherwise, negative values must be 
-        /// sign-extended to 64 bits to be varint encoded, thus always taking
-        /// 10 bytes on the wire.)
-        /// </remarks>
-        internal static ulong EncodeZigZag64(long n)
-        {
-            return (ulong) ((n << 1) ^ (n >> 63));
-        }
-
-        private void RefreshBuffer()
-        {
-            if (output == null)
-            {
-                // We're writing to a single buffer.
-                throw new OutOfSpaceException();
-            }
-
-            // Since we have an output stream, this is our buffer
-            // and buffer offset == 0
-            output.Write(buffer, 0, position);
-            position = 0;
-        }
-
-        /// <summary>
-        /// Indicates that a CodedOutputStream wrapping a flat byte array
-        /// ran out of space.
-        /// </summary>
-        public sealed class OutOfSpaceException : IOException
-        {
-            internal OutOfSpaceException()
-                : base("CodedOutputStream was writing to a flat byte array and ran out of space.")
-            {
-            }
-        }
-
-        /// <summary>
-        /// Flushes any buffered data and optionally closes the underlying stream, if any.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// By default, any underlying stream is closed by this method. To configure this behaviour,
-        /// use a constructor overload with a <c>leaveOpen</c> parameter. If this instance does not
-        /// have an underlying stream, this method does nothing.
-        /// </para>
-        /// <para>
-        /// For the sake of efficiency, calling this method does not prevent future write calls - but
-        /// if a later write ends up writing to a stream which has been disposed, that is likely to
-        /// fail. It is recommend that you not call any other methods after this.
-        /// </para>
-        /// </remarks>
-        public void Dispose()
-        {
-            Flush();
-            if (!leaveOpen)
-            {
-                output.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Flushes any buffered data to the underlying stream (if there is one).
-        /// </summary>
-        public void Flush()
-        {
-            if (output != null)
-            {
-                RefreshBuffer();
-            }
-        }
-
-        /// <summary>
-        /// Verifies that SpaceLeft returns zero. It's common to create a byte array
-        /// that is exactly big enough to hold a message, then write to it with
-        /// a CodedOutputStream. Calling CheckNoSpaceLeft after writing verifies that
-        /// the message was actually as big as expected, which can help bugs.
-        /// </summary>
-        public void CheckNoSpaceLeft()
-        {
-            if (SpaceLeft != 0)
-            {
-                throw new InvalidOperationException("Did not write as much data as expected.");
-            }
-        }
-
-        /// <summary>
-        /// If writing to a flat array, returns the space left in the array. Otherwise,
-        /// throws an InvalidOperationException.
-        /// </summary>
-        public int SpaceLeft
-        {
-            get
-            {
-                if (output == null)
-                {
-                    return limit - position;
-                }
-                else
-                {
-                    throw new InvalidOperationException(
-                        "SpaceLeft can only be called on CodedOutputStreams that are " +
-                        "writing to a flat array.");
-                }
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf/Collections/MapField.cs

@@ -1,760 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Compatibility;
-using Google.Protobuf.Reflection;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Representation of a map field in a Protocol Buffer message.
-    /// </summary>
-    /// <typeparam name="TKey">Key type in the map. Must be a type supported by Protocol Buffer map keys.</typeparam>
-    /// <typeparam name="TValue">Value type in the map. Must be a type supported by Protocol Buffers.</typeparam>
-    /// <remarks>
-    /// <para>
-    /// For string keys, the equality comparison is provided by <see cref="StringComparer.Ordinal" />.
-    /// </para>
-    /// <para>
-    /// Null values are not permitted in the map, either for wrapper types or regular messages.
-    /// If a map is deserialized from a data stream and the value is missing from an entry, a default value
-    /// is created instead. For primitive types, that is the regular default value (0, the empty string and so
-    /// on); for message types, an empty instance of the message is created, as if the map entry contained a 0-length
-    /// encoded value for the field.
-    /// </para>
-    /// <para>
-    /// This implementation does not generally prohibit the use of key/value types which are not
-    /// supported by Protocol Buffers (e.g. using a key type of <code>byte</code>) but nor does it guarantee
-    /// that all operations will work in such cases.
-    /// </para>
-    /// <para>
-    /// The order in which entries are returned when iterating over this object is undefined, and may change
-    /// in future versions.
-    /// </para>
-    /// </remarks>
-    public sealed class MapField<TKey, TValue> : IDeepCloneable<MapField<TKey, TValue>>, IDictionary<TKey, TValue>, IEquatable<MapField<TKey, TValue>>, IDictionary
-    {
-        // TODO: Don't create the map/list until we have an entry. (Assume many maps will be empty.)
-        private readonly Dictionary<TKey, LinkedListNode<KeyValuePair<TKey, TValue>>> map =
-            new Dictionary<TKey, LinkedListNode<KeyValuePair<TKey, TValue>>>();
-        private readonly LinkedList<KeyValuePair<TKey, TValue>> list = new LinkedList<KeyValuePair<TKey, TValue>>();
-
-        /// <summary>
-        /// Creates a deep clone of this object.
-        /// </summary>
-        /// <returns>
-        /// A deep clone of this object.
-        /// </returns>
-        public MapField<TKey, TValue> Clone()
-        {
-            var clone = new MapField<TKey, TValue>();
-            // Keys are never cloneable. Values might be.
-            if (typeof(IDeepCloneable<TValue>).IsAssignableFrom(typeof(TValue)))
-            {
-                foreach (var pair in list)
-                {
-                    clone.Add(pair.Key, ((IDeepCloneable<TValue>)pair.Value).Clone());
-                }
-            }
-            else
-            {
-                // Nothing is cloneable, so we don't need to worry.
-                clone.Add(this);
-            }
-            return clone;
-        }
-
-        /// <summary>
-        /// Adds the specified key/value pair to the map.
-        /// </summary>
-        /// <remarks>
-        /// This operation fails if the key already exists in the map. To replace an existing entry, use the indexer.
-        /// </remarks>
-        /// <param name="key">The key to add</param>
-        /// <param name="value">The value to add.</param>
-        /// <exception cref="System.ArgumentException">The given key already exists in map.</exception>
-        public void Add(TKey key, TValue value)
-        {
-            // Validation of arguments happens in ContainsKey and the indexer
-            if (ContainsKey(key))
-            {
-                throw new ArgumentException("Key already exists in map", nameof(key));
-            }
-            this[key] = value;
-        }
-
-        /// <summary>
-        /// Determines whether the specified key is present in the map.
-        /// </summary>
-        /// <param name="key">The key to check.</param>
-        /// <returns><c>true</c> if the map contains the given key; <c>false</c> otherwise.</returns>
-        public bool ContainsKey(TKey key)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-            return map.ContainsKey(key);
-        }
-
-        private bool ContainsValue(TValue value)
-        {
-            var comparer = EqualityComparer<TValue>.Default;
-            return list.Any(pair => comparer.Equals(pair.Value, value));
-        }
-
-        /// <summary>
-        /// Removes the entry identified by the given key from the map.
-        /// </summary>
-        /// <param name="key">The key indicating the entry to remove from the map.</param>
-        /// <returns><c>true</c> if the map contained the given key before the entry was removed; <c>false</c> otherwise.</returns>
-        public bool Remove(TKey key)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-            LinkedListNode<KeyValuePair<TKey, TValue>> node;
-            if (map.TryGetValue(key, out node))
-            {
-                map.Remove(key);
-                node.List.Remove(node);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The key whose value to get.</param>
-        /// <param name="value">When this method returns, the value associated with the specified key, if the key is found;
-        /// otherwise, the default value for the type of the <paramref name="value"/> parameter.
-        /// This parameter is passed uninitialized.</param>
-        /// <returns><c>true</c> if the map contains an element with the specified key; otherwise, <c>false</c>.</returns>
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            LinkedListNode<KeyValuePair<TKey, TValue>> node;
-            if (map.TryGetValue(key, out node))
-            {
-                value = node.Value.Value;
-                return true;
-            }
-            else
-            {
-                value = default(TValue);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The key of the value to get or set.</param>
-        /// <exception cref="KeyNotFoundException">The property is retrieved and key does not exist in the collection.</exception>
-        /// <returns>The value associated with the specified key. If the specified key is not found,
-        /// a get operation throws a <see cref="KeyNotFoundException"/>, and a set operation creates a new element with the specified key.</returns>
-        public TValue this[TKey key]
-        {
-            get
-            {
-                ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-                TValue value;
-                if (TryGetValue(key, out value))
-                {
-                    return value;
-                }
-                throw new KeyNotFoundException();
-            }
-            set
-            {
-                ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-                // value == null check here is redundant, but avoids boxing.
-                if (value == null)
-                {
-                    ProtoPreconditions.CheckNotNullUnconstrained(value, nameof(value));
-                }
-                LinkedListNode<KeyValuePair<TKey, TValue>> node;
-                var pair = new KeyValuePair<TKey, TValue>(key, value);
-                if (map.TryGetValue(key, out node))
-                {
-                    node.Value = pair;
-                }
-                else
-                {
-                    node = list.AddLast(pair);
-                    map[key] = node;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection containing the keys in the map.
-        /// </summary>
-        public ICollection<TKey> Keys { get { return new MapView<TKey>(this, pair => pair.Key, ContainsKey); } }
-
-        /// <summary>
-        /// Gets a collection containing the values in the map.
-        /// </summary>
-        public ICollection<TValue> Values { get { return new MapView<TValue>(this, pair => pair.Value, ContainsValue); } }
-
-        /// <summary>
-        /// Adds the specified entries to the map. The keys and values are not automatically cloned.
-        /// </summary>
-        /// <param name="entries">The entries to add to the map.</param>
-        public void Add(IDictionary<TKey, TValue> entries)
-        {
-            ProtoPreconditions.CheckNotNull(entries, nameof(entries));
-            foreach (var pair in entries)
-            {
-                Add(pair.Key, pair.Value);
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through the collection.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to iterate through the collection.
-        /// </returns>
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-        {
-            return list.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator" /> object that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Adds the specified item to the map.
-        /// </summary>
-        /// <param name="item">The item to add to the map.</param>
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
-        {
-            Add(item.Key, item.Value);
-        }
-
-        /// <summary>
-        /// Removes all items from the map.
-        /// </summary>
-        public void Clear()
-        {
-            list.Clear();
-            map.Clear();
-        }
-
-        /// <summary>
-        /// Determines whether map contains an entry equivalent to the given key/value pair.
-        /// </summary>
-        /// <param name="item">The key/value pair to find.</param>
-        /// <returns></returns>
-        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item)
-        {
-            TValue value;
-            return TryGetValue(item.Key, out value)
-                && EqualityComparer<TValue>.Default.Equals(item.Value, value);
-        }
-
-        /// <summary>
-        /// Copies the key/value pairs in this map to an array.
-        /// </summary>
-        /// <param name="array">The array to copy the entries into.</param>
-        /// <param name="arrayIndex">The index of the array at which to start copying values.</param>
-        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            list.CopyTo(array, arrayIndex);
-        }
-
-        /// <summary>
-        /// Removes the specified key/value pair from the map.
-        /// </summary>
-        /// <remarks>Both the key and the value must be found for the entry to be removed.</remarks>
-        /// <param name="item">The key/value pair to remove.</param>
-        /// <returns><c>true</c> if the key/value pair was found and removed; <c>false</c> otherwise.</returns>
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)
-        {
-            if (item.Key == null)
-            {
-                throw new ArgumentException("Key is null", nameof(item));
-            }
-            LinkedListNode<KeyValuePair<TKey, TValue>> node;
-            if (map.TryGetValue(item.Key, out node) &&
-                EqualityComparer<TValue>.Default.Equals(item.Value, node.Value.Value))
-            {
-                map.Remove(item.Key);
-                node.List.Remove(node);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of elements contained in the map.
-        /// </summary>
-        public int Count { get { return list.Count; } }
-
-        /// <summary>
-        /// Gets a value indicating whether the map is read-only.
-        /// </summary>
-        public bool IsReadOnly { get { return false; } }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="System.Object" /> to compare with this instance.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object other)
-        {
-            return Equals(other as MapField<TKey, TValue>);
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            var valueComparer = EqualityComparer<TValue>.Default;
-            int hash = 0;
-            foreach (var pair in list)
-            {
-                hash ^= pair.Key.GetHashCode() * 31 + valueComparer.GetHashCode(pair.Value);
-            }
-            return hash;
-        }
-
-        /// <summary>
-        /// Compares this map with another for equality.
-        /// </summary>
-        /// <remarks>
-        /// The order of the key/value pairs in the maps is not deemed significant in this comparison.
-        /// </remarks>
-        /// <param name="other">The map to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="other"/> refers to an equal map; <c>false</c> otherwise.</returns>
-        public bool Equals(MapField<TKey, TValue> other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-            if (other == this)
-            {
-                return true;
-            }
-            if (other.Count != this.Count)
-            {
-                return false;
-            }
-            var valueComparer = EqualityComparer<TValue>.Default;
-            foreach (var pair in this)
-            {
-                TValue value;
-                if (!other.TryGetValue(pair.Key, out value))
-                {
-                    return false;
-                }
-                if (!valueComparer.Equals(value, pair.Value))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Adds entries to the map from the given stream.
-        /// </summary>
-        /// <remarks>
-        /// It is assumed that the stream is initially positioned after the tag specified by the codec.
-        /// This method will continue reading entries from the stream until the end is reached, or
-        /// a different tag is encountered.
-        /// </remarks>
-        /// <param name="input">Stream to read from</param>
-        /// <param name="codec">Codec describing how the key/value pairs are encoded</param>
-        public void AddEntriesFrom(CodedInputStream input, Codec codec)
-        {
-            var adapter = new Codec.MessageAdapter(codec);
-            do
-            {
-                adapter.Reset();
-                input.ReadMessage(adapter);
-                this[adapter.Key] = adapter.Value;
-            } while (input.MaybeConsumeTag(codec.MapTag));
-        }
-
-        /// <summary>
-        /// Writes the contents of this map to the given coded output stream, using the specified codec
-        /// to encode each entry.
-        /// </summary>
-        /// <param name="output">The output stream to write to.</param>
-        /// <param name="codec">The codec to use for each entry.</param>
-        public void WriteTo(CodedOutputStream output, Codec codec)
-        {
-            var message = new Codec.MessageAdapter(codec);
-            foreach (var entry in list)
-            {
-                message.Key = entry.Key;
-                message.Value = entry.Value;
-                output.WriteTag(codec.MapTag);
-                output.WriteMessage(message);
-            }
-        }
-
-        /// <summary>
-        /// Calculates the size of this map based on the given entry codec.
-        /// </summary>
-        /// <param name="codec">The codec to use to encode each entry.</param>
-        /// <returns></returns>
-        public int CalculateSize(Codec codec)
-        {
-            if (Count == 0)
-            {
-                return 0;
-            }
-            var message = new Codec.MessageAdapter(codec);
-            int size = 0;
-            foreach (var entry in list)
-            {
-                message.Key = entry.Key;
-                message.Value = entry.Value;
-                size += CodedOutputStream.ComputeRawVarint32Size(codec.MapTag);
-                size += CodedOutputStream.ComputeMessageSize(message);
-            }
-            return size;
-        }
-
-        /// <summary>
-        /// Returns a string representation of this repeated field, in the same
-        /// way as it would be represented by the default JSON formatter.
-        /// </summary>
-        public override string ToString()
-        {
-            var writer = new StringWriter();
-            JsonFormatter.Default.WriteDictionary(writer, this);
-            return writer.ToString();
-        }
-
-        #region IDictionary explicit interface implementation
-        void IDictionary.Add(object key, object value)
-        {
-            Add((TKey)key, (TValue)value);
-        }
-
-        bool IDictionary.Contains(object key)
-        {
-            if (!(key is TKey))
-            {
-                return false;
-            }
-            return ContainsKey((TKey)key);
-        }
-
-        IDictionaryEnumerator IDictionary.GetEnumerator()
-        {
-            return new DictionaryEnumerator(GetEnumerator());
-        }
-
-        void IDictionary.Remove(object key)
-        {
-            ProtoPreconditions.CheckNotNull(key, nameof(key));
-            if (!(key is TKey))
-            {
-                return;
-            }
-            Remove((TKey)key);
-        }
-
-        void ICollection.CopyTo(Array array, int index)
-        {
-            // This is ugly and slow as heck, but with any luck it will never be used anyway.
-            ICollection temp = this.Select(pair => new DictionaryEntry(pair.Key, pair.Value)).ToList();
-            temp.CopyTo(array, index);
-        }
-
-        bool IDictionary.IsFixedSize { get { return false; } }
-
-        ICollection IDictionary.Keys { get { return (ICollection)Keys; } }
-
-        ICollection IDictionary.Values { get { return (ICollection)Values; } }
-
-        bool ICollection.IsSynchronized { get { return false; } }
-
-        object ICollection.SyncRoot { get { return this; } }
-
-        object IDictionary.this[object key]
-        {
-            get
-            {
-                ProtoPreconditions.CheckNotNull(key, nameof(key));
-                if (!(key is TKey))
-                {
-                    return null;
-                }
-                TValue value;
-                TryGetValue((TKey)key, out value);
-                return value;
-            }
-
-            set
-            {
-                this[(TKey)key] = (TValue)value;
-            }
-        }
-        #endregion
-
-        private class DictionaryEnumerator : IDictionaryEnumerator
-        {
-            private readonly IEnumerator<KeyValuePair<TKey, TValue>> enumerator;
-
-            internal DictionaryEnumerator(IEnumerator<KeyValuePair<TKey, TValue>> enumerator)
-            {
-                this.enumerator = enumerator;
-            }
-
-            public bool MoveNext()
-            {
-                return enumerator.MoveNext();
-            }
-
-            public void Reset()
-            {
-                enumerator.Reset();
-            }
-
-            public object Current { get { return Entry; } }
-            public DictionaryEntry Entry { get { return new DictionaryEntry(Key, Value); } }
-            public object Key { get { return enumerator.Current.Key; } }
-            public object Value { get { return enumerator.Current.Value; } }
-        }
-
-        /// <summary>
-        /// A codec for a specific map field. This contains all the information required to encode and
-        /// decode the nested messages.
-        /// </summary>
-        public sealed class Codec
-        {
-            private readonly FieldCodec<TKey> keyCodec;
-            private readonly FieldCodec<TValue> valueCodec;
-            private readonly uint mapTag;
-
-            /// <summary>
-            /// Creates a new entry codec based on a separate key codec and value codec,
-            /// and the tag to use for each map entry.
-            /// </summary>
-            /// <param name="keyCodec">The key codec.</param>
-            /// <param name="valueCodec">The value codec.</param>
-            /// <param name="mapTag">The map tag to use to introduce each map entry.</param>
-            public Codec(FieldCodec<TKey> keyCodec, FieldCodec<TValue> valueCodec, uint mapTag)
-            {
-                this.keyCodec = keyCodec;
-                this.valueCodec = valueCodec;
-                this.mapTag = mapTag;
-            }
-
-            /// <summary>
-            /// The tag used in the enclosing message to indicate map entries.
-            /// </summary>
-            internal uint MapTag { get { return mapTag; } }
-
-            /// <summary>
-            /// A mutable message class, used for parsing and serializing. This
-            /// delegates the work to a codec, but implements the <see cref="IMessage"/> interface
-            /// for interop with <see cref="CodedInputStream"/> and <see cref="CodedOutputStream"/>.
-            /// This is nested inside Codec as it's tightly coupled to the associated codec,
-            /// and it's simpler if it has direct access to all its fields.
-            /// </summary>
-            internal class MessageAdapter : IMessage
-            {
-                private static readonly byte[] ZeroLengthMessageStreamData = new byte[] { 0 };
-
-                private readonly Codec codec;
-                internal TKey Key { get; set; }
-                internal TValue Value { get; set; }
-
-                internal MessageAdapter(Codec codec)
-                {
-                    this.codec = codec;
-                }
-
-                internal void Reset()
-                {
-                    Key = codec.keyCodec.DefaultValue;
-                    Value = codec.valueCodec.DefaultValue;
-                }
-
-                public void MergeFrom(CodedInputStream input)
-                {
-                    uint tag;
-                    while ((tag = input.ReadTag()) != 0)
-                    {
-                        if (tag == codec.keyCodec.Tag)
-                        {
-                            Key = codec.keyCodec.Read(input);
-                        }
-                        else if (tag == codec.valueCodec.Tag)
-                        {
-                            Value = codec.valueCodec.Read(input);
-                        }
-                        else 
-                        {
-                            input.SkipLastField();
-                        }
-                    }
-
-                    // Corner case: a map entry with a key but no value, where the value type is a message.
-                    // Read it as if we'd seen an input stream with no data (i.e. create a "default" message).
-                    if (Value == null)
-                    {
-                        Value = codec.valueCodec.Read(new CodedInputStream(ZeroLengthMessageStreamData));
-                    }
-                }
-
-                public void WriteTo(CodedOutputStream output)
-                {
-                    codec.keyCodec.WriteTagAndValue(output, Key);
-                    codec.valueCodec.WriteTagAndValue(output, Value);
-                }
-
-                public int CalculateSize()
-                {
-                    return codec.keyCodec.CalculateSizeWithTag(Key) + codec.valueCodec.CalculateSizeWithTag(Value);
-                }
-
-                MessageDescriptor IMessage.Descriptor { get { return null; } }
-            }
-        }
-
-        private class MapView<T> : ICollection<T>, ICollection
-        {
-            private readonly MapField<TKey, TValue> parent;
-            private readonly Func<KeyValuePair<TKey, TValue>, T> projection;
-            private readonly Func<T, bool> containsCheck;
-
-            internal MapView(
-                MapField<TKey, TValue> parent,
-                Func<KeyValuePair<TKey, TValue>, T> projection,
-                Func<T, bool> containsCheck)
-            {
-                this.parent = parent;
-                this.projection = projection;
-                this.containsCheck = containsCheck;
-            }
-
-            public int Count { get { return parent.Count; } }
-
-            public bool IsReadOnly { get { return true; } }
-
-            public bool IsSynchronized { get { return false; } }
-
-            public object SyncRoot { get { return parent; } }
-
-            public void Add(T item)
-            {
-                throw new NotSupportedException();
-            }
-
-            public void Clear()
-            {
-                throw new NotSupportedException();
-            }
-
-            public bool Contains(T item)
-            {
-                return containsCheck(item);
-            }
-
-            public void CopyTo(T[] array, int arrayIndex)
-            {
-                if (arrayIndex < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(arrayIndex));
-                }
-                if (arrayIndex + Count  >= array.Length)
-                {
-                    throw new ArgumentException("Not enough space in the array", nameof(array));
-                }
-                foreach (var item in this)
-                {
-                    array[arrayIndex++] = item;
-                }
-            }
-
-            public IEnumerator<T> GetEnumerator()
-            {
-                return parent.list.Select(projection).GetEnumerator();
-            }
-
-            public bool Remove(T item)
-            {
-                throw new NotSupportedException();
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            public void CopyTo(Array array, int index)
-            {
-                if (index < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                if (index + Count >= array.Length)
-                {
-                    throw new ArgumentException("Not enough space in the array", nameof(array));
-                }
-                foreach (var item in this)
-                {
-                    array.SetValue(item, index++);
-                }
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs

@@ -1,147 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Read-only wrapper around another dictionary.
-    /// </summary>
-    internal sealed class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>
-    {
-        private readonly IDictionary<TKey, TValue> wrapped;
-
-        public ReadOnlyDictionary(IDictionary<TKey, TValue> wrapped)
-        {
-            this.wrapped = wrapped;
-        }
-
-        public void Add(TKey key, TValue value)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public bool ContainsKey(TKey key)
-        {
-            return wrapped.ContainsKey(key);
-        }
-
-        public ICollection<TKey> Keys
-        {
-            get { return wrapped.Keys; }
-        }
-
-        public bool Remove(TKey key)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            return wrapped.TryGetValue(key, out value);
-        }
-
-        public ICollection<TValue> Values
-        {
-            get { return wrapped.Values; }
-        }
-
-        public TValue this[TKey key]
-        {
-            get { return wrapped[key]; }
-            set { throw new InvalidOperationException(); }
-        }
-
-        public void Add(KeyValuePair<TKey, TValue> item)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public void Clear()
-        {
-            throw new InvalidOperationException();
-        }
-
-        public bool Contains(KeyValuePair<TKey, TValue> item)
-        {
-            return wrapped.Contains(item);
-        }
-
-        public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            wrapped.CopyTo(array, arrayIndex);
-        }
-
-        public int Count
-        {
-            get { return wrapped.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return true; }
-        }
-
-        public bool Remove(KeyValuePair<TKey, TValue> item)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-        {
-            return wrapped.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return ((IEnumerable) wrapped).GetEnumerator();
-        }
-
-        public override bool Equals(object obj)
-        {
-            return wrapped.Equals(obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return wrapped.GetHashCode();
-        }
-
-        public override string ToString()
-        {
-            return wrapped.ToString();
-        }
-    }
-}

csharp/src/Google.Protobuf/Collections/RepeatedField.cs

@@ -1,591 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// The contents of a repeated field: essentially, a collection with some extra
-    /// restrictions (no null values) and capabilities (deep cloning).
-    /// </summary>
-    /// <remarks>
-    /// This implementation does not generally prohibit the use of types which are not
-    /// supported by Protocol Buffers but nor does it guarantee that all operations will work in such cases.
-    /// </remarks>
-    /// <typeparam name="T">The element type of the repeated field.</typeparam>
-    public sealed class RepeatedField<T> : IList<T>, IList, IDeepCloneable<RepeatedField<T>>, IEquatable<RepeatedField<T>>
-    {
-        private static readonly T[] EmptyArray = new T[0];
-        private const int MinArraySize = 8;
-
-        private T[] array = EmptyArray;
-        private int count = 0;
-
-        /// <summary>
-        /// Creates a deep clone of this repeated field.
-        /// </summary>
-        /// <remarks>
-        /// If the field type is
-        /// a message type, each element is also cloned; otherwise, it is
-        /// assumed that the field type is primitive (including string and
-        /// bytes, both of which are immutable) and so a simple copy is
-        /// equivalent to a deep clone.
-        /// </remarks>
-        /// <returns>A deep clone of this repeated field.</returns>
-        public RepeatedField<T> Clone()
-        {
-            RepeatedField<T> clone = new RepeatedField<T>();
-            if (array != EmptyArray)
-            {
-                clone.array = (T[])array.Clone();
-                IDeepCloneable<T>[] cloneableArray = clone.array as IDeepCloneable<T>[];
-                if (cloneableArray != null)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        clone.array[i] = cloneableArray[i].Clone();
-                    }
-                }
-            }
-            clone.count = count;
-            return clone;
-        }
-
-        /// <summary>
-        /// Adds the entries from the given input stream, decoding them with the specified codec.
-        /// </summary>
-        /// <param name="input">The input stream to read from.</param>
-        /// <param name="codec">The codec to use in order to read each entry.</param>
-        public void AddEntriesFrom(CodedInputStream input, FieldCodec<T> codec)
-        {
-            // TODO: Inline some of the Add code, so we can avoid checking the size on every
-            // iteration.
-            uint tag = input.LastTag;
-            var reader = codec.ValueReader;
-            // Non-nullable value types can be packed or not.
-            if (FieldCodec<T>.IsPackedRepeatedField(tag))
-            {
-                int length = input.ReadLength();
-                if (length > 0)
-                {
-                    int oldLimit = input.PushLimit(length);
-                    while (!input.ReachedLimit)
-                    {
-                        Add(reader(input));
-                    }
-                    input.PopLimit(oldLimit);
-                }
-                // Empty packed field. Odd, but valid - just ignore.
-            }
-            else
-            {
-                // Not packed... (possibly not packable)
-                do
-                {
-                    Add(reader(input));
-                } while (input.MaybeConsumeTag(tag));
-            }
-        }
-
-        /// <summary>
-        /// Calculates the size of this collection based on the given codec.
-        /// </summary>
-        /// <param name="codec">The codec to use when encoding each field.</param>
-        /// <returns>The number of bytes that would be written to a <see cref="CodedOutputStream"/> by <see cref="WriteTo"/>,
-        /// using the same codec.</returns>
-        public int CalculateSize(FieldCodec<T> codec)
-        {
-            if (count == 0)
-            {
-                return 0;
-            }
-            uint tag = codec.Tag;
-            if (codec.PackedRepeatedField)
-            {
-                int dataSize = CalculatePackedDataSize(codec);
-                return CodedOutputStream.ComputeRawVarint32Size(tag) +
-                    CodedOutputStream.ComputeLengthSize(dataSize) +
-                    dataSize;
-            }
-            else
-            {
-                var sizeCalculator = codec.ValueSizeCalculator;
-                int size = count * CodedOutputStream.ComputeRawVarint32Size(tag);
-                for (int i = 0; i < count; i++)
-                {
-                    size += sizeCalculator(array[i]);
-                }
-                return size;
-            }
-        }
-
-        private int CalculatePackedDataSize(FieldCodec<T> codec)
-        {
-            int fixedSize = codec.FixedSize;
-            if (fixedSize == 0)
-            {
-                var calculator = codec.ValueSizeCalculator;
-                int tmp = 0;
-                for (int i = 0; i < count; i++)
-                {
-                    tmp += calculator(array[i]);
-                }
-                return tmp;
-            }
-            else
-            {
-                return fixedSize * Count;
-            }
-        }
-
-        /// <summary>
-        /// Writes the contents of this collection to the given <see cref="CodedOutputStream"/>,
-        /// encoding each value using the specified codec.
-        /// </summary>
-        /// <param name="output">The output stream to write to.</param>
-        /// <param name="codec">The codec to use when encoding each value.</param>
-        public void WriteTo(CodedOutputStream output, FieldCodec<T> codec)
-        {
-            if (count == 0)
-            {
-                return;
-            }
-            var writer = codec.ValueWriter;
-            var tag = codec.Tag;
-            if (codec.PackedRepeatedField)
-            {
-                // Packed primitive type
-                uint size = (uint)CalculatePackedDataSize(codec);
-                output.WriteTag(tag);
-                output.WriteRawVarint32(size);
-                for (int i = 0; i < count; i++)
-                {
-                    writer(output, array[i]);
-                }
-            }
-            else
-            {
-                // Not packed: a simple tag/value pair for each value.
-                // Can't use codec.WriteTagAndValue, as that omits default values.
-                for (int i = 0; i < count; i++)
-                {
-                    output.WriteTag(tag);
-                    writer(output, array[i]);
-                }
-            }
-        }
-
-        private void EnsureSize(int size)
-        {
-            if (array.Length < size)
-            {
-                size = Math.Max(size, MinArraySize);
-                int newSize = Math.Max(array.Length * 2, size);
-                var tmp = new T[newSize];
-                Array.Copy(array, 0, tmp, 0, array.Length);
-                array = tmp;
-            }
-        }
-
-        /// <summary>
-        /// Adds the specified item to the collection.
-        /// </summary>
-        /// <param name="item">The item to add.</param>
-        public void Add(T item)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(item, nameof(item));
-            EnsureSize(count + 1);
-            array[count++] = item;
-        }
-
-        /// <summary>
-        /// Removes all items from the collection.
-        /// </summary>
-        public void Clear()
-        {
-            array = EmptyArray;
-            count = 0;
-        }
-
-        /// <summary>
-        /// Determines whether this collection contains the given item.
-        /// </summary>
-        /// <param name="item">The item to find.</param>
-        /// <returns><c>true</c> if this collection contains the given item; <c>false</c> otherwise.</returns>
-        public bool Contains(T item)
-        {
-            return IndexOf(item) != -1;
-        }
-
-        /// <summary>
-        /// Copies this collection to the given array.
-        /// </summary>
-        /// <param name="array">The array to copy to.</param>
-        /// <param name="arrayIndex">The first index of the array to copy to.</param>
-        public void CopyTo(T[] array, int arrayIndex)
-        {
-            Array.Copy(this.array, 0, array, arrayIndex, count);
-        }
-
-        /// <summary>
-        /// Removes the specified item from the collection
-        /// </summary>
-        /// <param name="item">The item to remove.</param>
-        /// <returns><c>true</c> if the item was found and removed; <c>false</c> otherwise.</returns>
-        public bool Remove(T item)
-        {
-            int index = IndexOf(item);
-            if (index == -1)
-            {
-                return false;
-            }            
-            Array.Copy(array, index + 1, array, index, count - index - 1);
-            count--;
-            array[count] = default(T);
-            return true;
-        }
-
-        /// <summary>
-        /// Gets the number of elements contained in the collection.
-        /// </summary>
-        public int Count => count;
-
-        /// <summary>
-        /// Gets a value indicating whether the collection is read-only.
-        /// </summary>
-        public bool IsReadOnly => false;
-
-        /// <summary>
-        /// Adds all of the specified values into this collection.
-        /// </summary>
-        /// <param name="values">The values to add to this collection.</param>
-        public void AddRange(IEnumerable<T> values)
-        {
-            ProtoPreconditions.CheckNotNull(values, nameof(values));
-
-            // Optimization 1: If the collection we're adding is already a RepeatedField<T>,
-            // we know the values are valid.
-            var otherRepeatedField = values as RepeatedField<T>;
-            if (otherRepeatedField != null)
-            {
-                EnsureSize(count + otherRepeatedField.count);
-                Array.Copy(otherRepeatedField.array, 0, array, count, otherRepeatedField.count);
-                count += otherRepeatedField.count;
-                return;
-            }
-
-            // Optimization 2: The collection is an ICollection, so we can expand
-            // just once and ask the collection to copy itself into the array.
-            var collection = values as ICollection;
-            if (collection != null)
-            {
-                var extraCount = collection.Count;
-                // For reference types and nullable value types, we need to check that there are no nulls
-                // present. (This isn't a thread-safe approach, but we don't advertise this is thread-safe.)
-                // We expect the JITter to optimize this test to true/false, so it's effectively conditional
-                // specialization.
-                if (default(T) == null)
-                {
-                    // TODO: Measure whether iterating once to check and then letting the collection copy
-                    // itself is faster or slower than iterating and adding as we go. For large
-                    // collections this will not be great in terms of cache usage... but the optimized
-                    // copy may be significantly faster than doing it one at a time.
-                    foreach (var item in collection)
-                    {
-                        if (item == null)
-                        {
-                            throw new ArgumentException("Sequence contained null element", nameof(values));
-                        }
-                    }
-                }
-                EnsureSize(count + extraCount);
-                collection.CopyTo(array, count);
-                count += extraCount;
-                return;
-            }
-
-            // We *could* check for ICollection<T> as well, but very very few collections implement
-            // ICollection<T> but not ICollection. (HashSet<T> does, for one...)
-
-            // Fall back to a slower path of adding items one at a time.
-            foreach (T item in values)
-            {
-                Add(item);
-            }
-        }
-
-        /// <summary>
-        /// Adds all of the specified values into this collection. This method is present to
-        /// allow repeated fields to be constructed from queries within collection initializers.
-        /// Within non-collection-initializer code, consider using the equivalent <see cref="AddRange"/>
-        /// method instead for clarity.
-        /// </summary>
-        /// <param name="values">The values to add to this collection.</param>
-        public void Add(IEnumerable<T> values)
-        {
-            AddRange(values);
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through the collection.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to iterate through the collection.
-        /// </returns>
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = 0; i < count; i++)
-            {
-                yield return array[i];
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as RepeatedField<T>);
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator" /> object that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 0;
-            for (int i = 0; i < count; i++)
-            {
-                hash = hash * 31 + array[i].GetHashCode();
-            }
-            return hash;
-        }
-
-        /// <summary>
-        /// Compares this repeated field with another for equality.
-        /// </summary>
-        /// <param name="other">The repeated field to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="other"/> refers to an equal repeated field; <c>false</c> otherwise.</returns>
-        public bool Equals(RepeatedField<T> other)
-        {
-            if (ReferenceEquals(other, null))
-            {
-                return false;
-            }
-            if (ReferenceEquals(other, this))
-            {
-                return true;
-            }
-            if (other.Count != this.Count)
-            {
-                return false;
-            }
-            EqualityComparer<T> comparer = EqualityComparer<T>.Default;
-            for (int i = 0; i < count; i++)
-            {
-                if (!comparer.Equals(array[i], other.array[i]))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Returns the index of the given item within the collection, or -1 if the item is not
-        /// present.
-        /// </summary>
-        /// <param name="item">The item to find in the collection.</param>
-        /// <returns>The zero-based index of the item, or -1 if it is not found.</returns>
-        public int IndexOf(T item)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(item, nameof(item));
-            EqualityComparer<T> comparer = EqualityComparer<T>.Default;
-            for (int i = 0; i < count; i++)
-            {
-                if (comparer.Equals(array[i], item))
-                {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
-        /// <summary>
-        /// Inserts the given item at the specified index.
-        /// </summary>
-        /// <param name="index">The index at which to insert the item.</param>
-        /// <param name="item">The item to insert.</param>
-        public void Insert(int index, T item)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(item, nameof(item));
-            if (index < 0 || index > count)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-            EnsureSize(count + 1);
-            Array.Copy(array, index, array, index + 1, count - index);
-            array[index] = item;
-            count++;
-        }
-
-        /// <summary>
-        /// Removes the item at the given index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the item to remove.</param>
-        public void RemoveAt(int index)
-        {
-            if (index < 0 || index >= count)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-            Array.Copy(array, index + 1, array, index, count - index - 1);
-            count--;
-            array[count] = default(T);
-        }
-
-        /// <summary>
-        /// Returns a string representation of this repeated field, in the same
-        /// way as it would be represented by the default JSON formatter.
-        /// </summary>
-        public override string ToString()
-        {
-            var writer = new StringWriter();
-            JsonFormatter.Default.WriteList(writer, this);
-            return writer.ToString();
-        }
-
-        /// <summary>
-        /// Gets or sets the item at the specified index.
-        /// </summary>
-        /// <value>
-        /// The element at the specified index.
-        /// </value>
-        /// <param name="index">The zero-based index of the element to get or set.</param>
-        /// <returns>The item at the specified index.</returns>
-        public T this[int index]
-        {
-            get
-            {
-                if (index < 0 || index >= count)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                return array[index];
-            }
-            set
-            {
-                if (index < 0 || index >= count)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                ProtoPreconditions.CheckNotNullUnconstrained(value, nameof(value));
-                array[index] = value;
-            }
-        }
-
-        #region Explicit interface implementation for IList and ICollection.
-        bool IList.IsFixedSize => false;
-
-        void ICollection.CopyTo(Array array, int index)
-        {
-            Array.Copy(this.array, 0, array, index, count);
-        }
-
-        bool ICollection.IsSynchronized => false;
-
-        object ICollection.SyncRoot => this;
-
-        object IList.this[int index]
-        {
-            get { return this[index]; }
-            set { this[index] = (T)value; }
-        }
-
-        int IList.Add(object value)
-        {
-            Add((T) value);
-            return count - 1;
-        }
-
-        bool IList.Contains(object value)
-        {
-            return (value is T && Contains((T)value));
-        }
-
-        int IList.IndexOf(object value)
-        {
-            if (!(value is T))
-            {
-                return -1;
-            }
-            return IndexOf((T)value);
-        }
-
-        void IList.Insert(int index, object value)
-        {
-            Insert(index, (T) value);
-        }
-
-        void IList.Remove(object value)
-        {
-            if (!(value is T))
-            {
-                return;
-            }
-            Remove((T)value);
-        }
-        #endregion        
-    }
-}

csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs

@@ -1,72 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Reflection;
-
-namespace Google.Protobuf.Compatibility
-{
-    /// <summary>
-    /// Extension methods for <see cref="PropertyInfo"/>, effectively providing
-    /// the familiar members from previous desktop framework versions while
-    /// targeting the newer releases, .NET Core etc.
-    /// </summary>
-    internal static class PropertyInfoExtensions
-    {
-        /// <summary>
-        /// Returns the public getter of a property, or null if there is no such getter
-        /// (either because it's read-only, or the getter isn't public).
-        /// </summary>
-        internal static MethodInfo GetGetMethod(this PropertyInfo target)
-        {
-#if DOTNET35
-            var method = target.GetGetMethod();
-#else
-            var method = target.GetMethod;
-#endif
-            return method != null && method.IsPublic ? method : null;
-        }
-
-        /// <summary>
-        /// Returns the public setter of a property, or null if there is no such setter
-        /// (either because it's write-only, or the setter isn't public).
-        /// </summary>
-        internal static MethodInfo GetSetMethod(this PropertyInfo target)
-        {
-#if DOTNET35
-            var method = target.GetSetMethod();
-#else
-            var method = target.SetMethod;
-#endif
-            return method != null && method.IsPublic ? method : null;
-        }
-    }
-}

csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs

@@ -1,106 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Reflection;
-
-#if !DOTNET35
-namespace Google.Protobuf.Compatibility
-{
-    /// <summary>
-    /// Provides extension methods on Type that just proxy to TypeInfo.
-    /// These are used to support the new type system from .NET 4.5, without
-    /// having calls to GetTypeInfo all over the place. While the methods here are meant to be
-    /// broadly compatible with the desktop framework, there are some subtle differences in behaviour - but
-    /// they're not expected to affect our use cases. While the class is internal, that should be fine: we can
-    /// evaluate each new use appropriately.
-    /// </summary>
-    internal static class TypeExtensions
-    {
-        /// <summary>
-        /// See https://msdn.microsoft.com/en-us/library/system.type.isassignablefrom
-        /// </summary>
-        internal static bool IsAssignableFrom(this Type target, Type c)
-        {
-            return target.GetTypeInfo().IsAssignableFrom(c.GetTypeInfo());
-        }
-
-        /// <summary>
-        /// Returns a representation of the public property associated with the given name in the given type,
-        /// including inherited properties or null if there is no such public property.
-        /// Here, "public property" means a property where either the getter, or the setter, or both, is public.
-        /// </summary>
-        internal static PropertyInfo GetProperty(this Type target, string name)
-        {
-            // GetDeclaredProperty only returns properties declared in the given type, so we need to recurse.
-            while (target != null)
-            {
-                var typeInfo = target.GetTypeInfo();
-                var ret = typeInfo.GetDeclaredProperty(name);
-                if (ret != null && ((ret.CanRead && ret.GetMethod.IsPublic) || (ret.CanWrite && ret.SetMethod.IsPublic)))
-                {
-                    return ret;
-                }
-                target = typeInfo.BaseType;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a representation of the public method associated with the given name in the given type,
-        /// including inherited methods.
-        /// </summary>
-        /// <remarks>
-        /// This has a few differences compared with Type.GetMethod in the desktop framework. It will throw
-        /// if there is an ambiguous match even between a private method and a public one, but it *won't* throw
-        /// if there are two overloads at different levels in the type hierarchy (e.g. class Base declares public void Foo(int) and
-        /// class Child : Base declares public void Foo(long)).
-        /// </remarks>
-        /// <exception cref="AmbiguousMatchException">One type in the hierarchy declared more than one method with the same name</exception>
-        internal static MethodInfo GetMethod(this Type target, string name)
-        {
-            // GetDeclaredMethod only returns methods declared in the given type, so we need to recurse.
-            while (target != null)
-            {
-                var typeInfo = target.GetTypeInfo();
-                var ret = typeInfo.GetDeclaredMethod(name);
-                if (ret != null && ret.IsPublic)
-                {
-                    return ret;
-                }
-                target = typeInfo.BaseType;
-            }
-            return null;
-        }
-    }
-}
-#endif

csharp/src/Google.Protobuf/FieldCodec.cs

@@ -1,474 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Compatibility;
-using Google.Protobuf.WellKnownTypes;
-using System;
-using System.Collections.Generic;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Factory methods for <see cref="FieldCodec{T}"/>.
-    /// </summary>
-    public static class FieldCodec
-    {
-        // TODO: Avoid the "dual hit" of lambda expressions: create open delegates instead. (At least test...)
-
-        /// <summary>
-        /// Retrieves a codec suitable for a string field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<string> ForString(uint tag)
-        {
-            return new FieldCodec<string>(input => input.ReadString(), (output, value) => output.WriteString(value), CodedOutputStream.ComputeStringSize, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a bytes field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ByteString> ForBytes(uint tag)
-        {
-            return new FieldCodec<ByteString>(input => input.ReadBytes(), (output, value) => output.WriteBytes(value), CodedOutputStream.ComputeBytesSize, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a bool field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<bool> ForBool(uint tag)
-        {
-            return new FieldCodec<bool>(input => input.ReadBool(), (output, value) => output.WriteBool(value), CodedOutputStream.ComputeBoolSize, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an int32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForInt32(uint tag)
-        {
-            return new FieldCodec<int>(input => input.ReadInt32(), (output, value) => output.WriteInt32(value), CodedOutputStream.ComputeInt32Size, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sint32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForSInt32(uint tag)
-        {
-            return new FieldCodec<int>(input => input.ReadSInt32(), (output, value) => output.WriteSInt32(value), CodedOutputStream.ComputeSInt32Size, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a fixed32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<uint> ForFixed32(uint tag)
-        {
-            return new FieldCodec<uint>(input => input.ReadFixed32(), (output, value) => output.WriteFixed32(value), 4, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sfixed32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForSFixed32(uint tag)
-        {
-            return new FieldCodec<int>(input => input.ReadSFixed32(), (output, value) => output.WriteSFixed32(value), 4, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a uint32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<uint> ForUInt32(uint tag)
-        {
-            return new FieldCodec<uint>(input => input.ReadUInt32(), (output, value) => output.WriteUInt32(value), CodedOutputStream.ComputeUInt32Size, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an int64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForInt64(uint tag)
-        {
-            return new FieldCodec<long>(input => input.ReadInt64(), (output, value) => output.WriteInt64(value), CodedOutputStream.ComputeInt64Size, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sint64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForSInt64(uint tag)
-        {
-            return new FieldCodec<long>(input => input.ReadSInt64(), (output, value) => output.WriteSInt64(value), CodedOutputStream.ComputeSInt64Size, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a fixed64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ulong> ForFixed64(uint tag)
-        {
-            return new FieldCodec<ulong>(input => input.ReadFixed64(), (output, value) => output.WriteFixed64(value), 8, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sfixed64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForSFixed64(uint tag)
-        {
-            return new FieldCodec<long>(input => input.ReadSFixed64(), (output, value) => output.WriteSFixed64(value), 8, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a uint64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ulong> ForUInt64(uint tag)
-        {
-            return new FieldCodec<ulong>(input => input.ReadUInt64(), (output, value) => output.WriteUInt64(value), CodedOutputStream.ComputeUInt64Size, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a float field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<float> ForFloat(uint tag)
-        {
-            return new FieldCodec<float>(input => input.ReadFloat(), (output, value) => output.WriteFloat(value), CodedOutputStream.ComputeFloatSize, tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a double field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<double> ForDouble(uint tag)
-        {
-            return new FieldCodec<double>(input => input.ReadDouble(), (output, value) => output.WriteDouble(value), CodedOutputStream.ComputeDoubleSize, tag);
-        }
-
-        // Enums are tricky. We can probably use expression trees to build these delegates automatically,
-        // but it's easy to generate the code for it.
-
-        /// <summary>
-        /// Retrieves a codec suitable for an enum field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="toInt32">A conversion function from <see cref="Int32"/> to the enum type.</param>
-        /// <param name="fromInt32">A conversion function from the enum type to <see cref="Int32"/>.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<T> ForEnum<T>(uint tag, Func<T, int> toInt32, Func<int, T> fromInt32)
-        {
-            return new FieldCodec<T>(input => fromInt32(
-                input.ReadEnum()),
-                (output, value) => output.WriteEnum(toInt32(value)),
-                value => CodedOutputStream.ComputeEnumSize(toInt32(value)), tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a message field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="parser">A parser to use for the message type.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<T> ForMessage<T>(uint tag, MessageParser<T> parser) where T : IMessage<T>
-        {
-            return new FieldCodec<T>(input => { T message = parser.CreateTemplate(); input.ReadMessage(message); return message; },
-                (output, value) => output.WriteMessage(value), message => CodedOutputStream.ComputeMessageSize(message), tag);
-        }
-
-        /// <summary>
-        /// Creates a codec for a wrapper type of a class - which must be string or ByteString.
-        /// </summary>
-        public static FieldCodec<T> ForClassWrapper<T>(uint tag) where T : class
-        {
-            var nestedCodec = WrapperCodecs.GetCodec<T>();
-            return new FieldCodec<T>(
-                input => WrapperCodecs.Read<T>(input, nestedCodec),
-                (output, value) => WrapperCodecs.Write<T>(output, value, nestedCodec),
-                value => WrapperCodecs.CalculateSize<T>(value, nestedCodec),
-                tag,
-                null); // Default value for the wrapper
-        }
-
-        /// <summary>
-        /// Creates a codec for a wrapper type of a struct - which must be Int32, Int64, UInt32, UInt64,
-        /// Bool, Single or Double.
-        /// </summary>
-        public static FieldCodec<T?> ForStructWrapper<T>(uint tag) where T : struct
-        {
-            var nestedCodec = WrapperCodecs.GetCodec<T>();
-            return new FieldCodec<T?>(
-                input => WrapperCodecs.Read<T>(input, nestedCodec),
-                (output, value) => WrapperCodecs.Write<T>(output, value.Value, nestedCodec),
-                value => value == null ? 0 : WrapperCodecs.CalculateSize<T>(value.Value, nestedCodec),
-                tag,
-                null); // Default value for the wrapper
-        }
-
-        /// <summary>
-        /// Helper code to create codecs for wrapper types.
-        /// </summary>
-        /// <remarks>
-        /// Somewhat ugly with all the static methods, but the conversions involved to/from nullable types make it
-        /// slightly tricky to improve. So long as we keep the public API (ForClassWrapper, ForStructWrapper) in place,
-        /// we can refactor later if we come up with something cleaner.
-        /// </remarks>
-        private static class WrapperCodecs
-        {
-            private static readonly Dictionary<System.Type, object> Codecs = new Dictionary<System.Type, object>
-            {
-                { typeof(bool), ForBool(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(int), ForInt32(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(long), ForInt64(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(uint), ForUInt32(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(ulong), ForUInt64(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(float), ForFloat(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Fixed32)) },
-                { typeof(double), ForDouble(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Fixed64)) },
-                { typeof(string), ForString(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.LengthDelimited)) },
-                { typeof(ByteString), ForBytes(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.LengthDelimited)) }
-            };
-
-            /// <summary>
-            /// Returns a field codec which effectively wraps a value of type T in a message.
-            /// 
-            /// </summary>
-            internal static FieldCodec<T> GetCodec<T>()
-            {
-                object value;
-                if (!Codecs.TryGetValue(typeof(T), out value))
-                {
-                    throw new InvalidOperationException("Invalid type argument requested for wrapper codec: " + typeof(T));
-                }
-                return (FieldCodec<T>) value;
-            }
-
-            internal static T Read<T>(CodedInputStream input, FieldCodec<T> codec)
-            {
-                int length = input.ReadLength();
-                int oldLimit = input.PushLimit(length);
-
-                uint tag;
-                T value = codec.DefaultValue;
-                while ((tag = input.ReadTag()) != 0)
-                {
-                    if (tag == codec.Tag)
-                    {
-                        value = codec.Read(input);
-                    }
-                    else
-                    {
-                        input.SkipLastField();
-                    }
-
-                }
-                input.CheckReadEndOfStreamTag();
-                input.PopLimit(oldLimit);
-
-                return value;
-            }
-
-            internal static void Write<T>(CodedOutputStream output, T value, FieldCodec<T> codec)
-            {
-                output.WriteLength(codec.CalculateSizeWithTag(value));
-                codec.WriteTagAndValue(output, value);
-            }
-
-            internal  static int CalculateSize<T>(T value, FieldCodec<T> codec)
-            {
-                int fieldLength = codec.CalculateSizeWithTag(value);
-                return CodedOutputStream.ComputeLengthSize(fieldLength) + fieldLength;
-            }
-        }
-    }
-
-    /// <summary>
-    /// <para>
-    /// An encode/decode pair for a single field. This effectively encapsulates
-    /// all the information needed to read or write the field value from/to a coded
-    /// stream.
-    /// </para>
-    /// <para>
-    /// This class is public and has to be as it is used by generated code, but its public
-    /// API is very limited - just what the generated code needs to call directly.
-    /// </para>
-    /// </summary>
-    /// <remarks>
-    /// This never writes default values to the stream, and does not address "packedness"
-    /// in repeated fields itself, other than to know whether or not the field *should* be packed.
-    /// </remarks>
-    public sealed class FieldCodec<T>
-    {
-        private static readonly T DefaultDefault;
-        // Only non-nullable value types support packing. This is the simplest way of detecting that.
-        private static readonly bool TypeSupportsPacking = default(T) != null;
-
-        static FieldCodec()
-        {
-            if (typeof(T) == typeof(string))
-            {
-                DefaultDefault = (T)(object)"";
-            }
-            else if (typeof(T) == typeof(ByteString))
-            {
-                DefaultDefault = (T)(object)ByteString.Empty;
-            }
-            // Otherwise it's the default value of the CLR type
-        }
-
-        internal static bool IsPackedRepeatedField(uint tag) =>
-            TypeSupportsPacking && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited;
-
-        internal bool PackedRepeatedField { get; }
-
-        /// <summary>
-        /// Returns a delegate to write a value (unconditionally) to a coded output stream.
-        /// </summary>
-        internal Action<CodedOutputStream, T> ValueWriter { get; }
-
-        /// <summary>
-        /// Returns the size calculator for just a value.
-        /// </summary>
-        internal Func<T, int> ValueSizeCalculator { get; }
-
-        /// <summary>
-        /// Returns a delegate to read a value from a coded input stream. It is assumed that
-        /// the stream is already positioned on the appropriate tag.
-        /// </summary>
-        internal Func<CodedInputStream, T> ValueReader { get; }
-
-        /// <summary>
-        /// Returns the fixed size for an entry, or 0 if sizes vary.
-        /// </summary>
-        internal int FixedSize { get; }
-
-        /// <summary>
-        /// Gets the tag of the codec.
-        /// </summary>
-        /// <value>
-        /// The tag of the codec.
-        /// </value>
-        internal uint Tag { get; }
-
-        /// <summary>
-        /// Default value for this codec. Usually the same for every instance of the same type, but
-        /// for string/ByteString wrapper fields the codec's default value is null, whereas for
-        /// other string/ByteString fields it's "" or ByteString.Empty.
-        /// </summary>
-        /// <value>
-        /// The default value of the codec's type.
-        /// </value>
-        internal T DefaultValue { get; }
-
-        private readonly int tagSize;
-        
-        internal FieldCodec(
-                Func<CodedInputStream, T> reader,
-                Action<CodedOutputStream, T> writer,
-                int fixedSize,
-                uint tag) : this(reader, writer, _ => fixedSize, tag)
-        {
-            FixedSize = fixedSize;
-        }
-
-        internal FieldCodec(
-            Func<CodedInputStream, T> reader,
-            Action<CodedOutputStream, T> writer,
-            Func<T, int> sizeCalculator,
-            uint tag) : this(reader, writer, sizeCalculator, tag, DefaultDefault)
-        {
-        }
-
-        internal FieldCodec(
-            Func<CodedInputStream, T> reader,
-            Action<CodedOutputStream, T> writer,
-            Func<T, int> sizeCalculator,
-            uint tag,
-            T defaultValue)
-        {
-            ValueReader = reader;
-            ValueWriter = writer;
-            ValueSizeCalculator = sizeCalculator;
-            FixedSize = 0;
-            Tag = tag;
-            DefaultValue = defaultValue;
-            tagSize = CodedOutputStream.ComputeRawVarint32Size(tag);
-            // Detect packed-ness once, so we can check for it within RepeatedField<T>.
-            PackedRepeatedField = IsPackedRepeatedField(tag);
-        }
-
-        /// <summary>
-        /// Write a tag and the given value, *if* the value is not the default.
-        /// </summary>
-        public void WriteTagAndValue(CodedOutputStream output, T value)
-        {
-            if (!IsDefault(value))
-            {
-                output.WriteTag(Tag);
-                ValueWriter(output, value);
-            }
-        }
-
-        /// <summary>
-        /// Reads a value of the codec type from the given <see cref="CodedInputStream"/>.
-        /// </summary>
-        /// <param name="input">The input stream to read from.</param>
-        /// <returns>The value read from the stream.</returns>
-        public T Read(CodedInputStream input) => ValueReader(input);
-
-        /// <summary>
-        /// Calculates the size required to write the given value, with a tag,
-        /// if the value is not the default.
-        /// </summary>
-        public int CalculateSizeWithTag(T value) => IsDefault(value) ? 0 : ValueSizeCalculator(value) + tagSize;
-
-        private bool IsDefault(T value) => EqualityComparer<T>.Default.Equals(value, DefaultValue);
-    }
-}

csharp/src/Google.Protobuf/FrameworkPortability.cs

@@ -1,49 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Text.RegularExpressions;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Class containing helpful workarounds for various platform compatibility
-    /// </summary>
-    internal static class FrameworkPortability
-    {
-        // The value of RegexOptions.Compiled is 8. We can test for the presence at
-        // execution time using Enum.IsDefined, so a single build will do the right thing
-        // on each platform. (RegexOptions.Compiled isn't supported by PCLs.)
-        internal static readonly RegexOptions CompiledRegexWhereAvailable =
-            Enum.IsDefined(typeof(RegexOptions), 8) ? (RegexOptions)8 : RegexOptions.None;
-    }
-}

csharp/src/Google.Protobuf/Google.Protobuf.xproj

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>9b576380-726d-4142-8238-60a43ab0e35a</ProjectGuid>
-    <RootNamespace>Google.Protobuf</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs

@@ -1,69 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// A message type that has a custom string format for diagnostic purposes.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Calling <see cref="object.ToString"/> on a generated message type normally
-    /// returns the JSON representation. If a message type implements this interface,
-    /// then the <see cref="ToDiagnosticString"/> method will be called instead of the regular
-    /// JSON formatting code, but only when <c>ToString()</c> is called either on the message itself
-    /// or on another message which contains it. This does not affect the normal JSON formatting of
-    /// the message.
-    /// </para>
-    /// <para>
-    /// For example, if you create a proto message representing a GUID, the internal
-    /// representation may be a <c>bytes</c> field or four <c>fixed32</c> fields. However, when debugging
-    /// it may be more convenient to see a result in the same format as <see cref="System.Guid"/> provides.
-    /// </para>
-    /// <para>This interface extends <see cref="IMessage"/> to avoid it accidentally being implemented
-    /// on types other than messages, where it would not be used by anything in the framework.</para>
-    /// </remarks>
-    public interface ICustomDiagnosticMessage : IMessage
-    {
-        /// <summary>
-        /// Returns a string representation of this object, for diagnostic purposes.
-        /// </summary>
-        /// <remarks>
-        /// This method is called when a message is formatted as part of a <see cref="object.ToString"/>
-        /// call. It does not affect the JSON representation used by <see cref="JsonFormatter"/> other than
-        /// in calls to <see cref="JsonFormatter.ToDiagnosticString(IMessage)"/>. While it is recommended
-        /// that the result is valid JSON, this is never assumed by the Protobuf library.
-        /// </remarks>
-        /// <returns>A string representation of this object, for diagnostic purposes.</returns>
-        string ToDiagnosticString();
-    }
-}

csharp/src/Google.Protobuf/IDeepCloneable.cs

@@ -1,54 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Generic interface for a deeply cloneable type.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// All generated messages implement this interface, but so do some non-message types.
-    /// Additionally, due to the type constraint on <c>T</c> in <see cref="IMessage{T}"/>,
-    /// it is simpler to keep this as a separate interface.
-    /// </para>
-    /// </remarks>
-    /// <typeparam name="T">The type itself, returned by the <see cref="Clone"/> method.</typeparam>
-    public interface IDeepCloneable<T>
-    {
-        /// <summary>
-        /// Creates a deep clone of this object.
-        /// </summary>
-        /// <returns>A deep clone of this object.</returns>
-        T Clone();
-    }
-}

csharp/src/Google.Protobuf/IMessage.cs

@@ -1,87 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.Reflection;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Interface for a Protocol Buffers message, supporting
-    /// basic operations required for serialization.
-    /// </summary>
-    public interface IMessage
-    {
-        /// <summary>
-        /// Merges the data from the specified coded input stream with the current message.
-        /// </summary>
-        /// <remarks>See the user guide for precise merge semantics.</remarks>
-        /// <param name="input"></param>
-        void MergeFrom(CodedInputStream input);
-
-        /// <summary>
-        /// Writes the data to the given coded output stream.
-        /// </summary>
-        /// <param name="output">Coded output stream to write the data to. Must not be null.</param>
-        void WriteTo(CodedOutputStream output);
-
-        /// <summary>
-        /// Calculates the size of this message in Protocol Buffer wire format, in bytes.
-        /// </summary>
-        /// <returns>The number of bytes required to write this message
-        /// to a coded output stream.</returns>
-        int CalculateSize();
-
-        /// <summary>
-        /// Descriptor for this message. All instances are expected to return the same descriptor,
-        /// and for generated types this will be an explicitly-implemented member, returning the
-        /// same value as the static property declared on the type.
-        /// </summary>
-        MessageDescriptor Descriptor { get; }
-    }
-
-    /// <summary>
-    /// Generic interface for a Protocol Buffers message,
-    /// where the type parameter is expected to be the same type as
-    /// the implementation class.
-    /// </summary>
-    /// <typeparam name="T">The message type.</typeparam>
-    public interface IMessage<T> : IMessage, IEquatable<T>, IDeepCloneable<T> where T : IMessage<T>
-    {
-        /// <summary>
-        /// Merges the given message into this one.
-        /// </summary>
-        /// <remarks>See the user guide for precise merge semantics.</remarks>
-        /// <param name="message">The message to merge with this one. Must not be null.</param>
-        void MergeFrom(T message);
-    }
-}

csharp/src/Google.Protobuf/InvalidJsonException.cs

@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Thrown when an attempt is made to parse invalid JSON, e.g. using
-    /// a non-string property key, or including a redundant comma. Parsing a protocol buffer
-    /// message represented in JSON using <see cref="JsonParser"/> can throw both this
-    /// exception and <see cref="InvalidProtocolBufferException"/> depending on the situation. This
-    /// exception is only thrown for "pure JSON" errors, whereas <c>InvalidProtocolBufferException</c>
-    /// is thrown when the JSON may be valid in and of itself, but cannot be parsed as a protocol buffer
-    /// message.
-    /// </summary>
-    public sealed class InvalidJsonException : IOException
-    {
-        internal InvalidJsonException(string message)
-            : base(message)
-        {
-        }
-    }
-}

csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs

@@ -1,129 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Thrown when a protocol message being parsed is invalid in some way,
-    /// e.g. it contains a malformed varint or a negative byte length.
-    /// </summary>
-    public sealed class InvalidProtocolBufferException : IOException
-    {
-        internal InvalidProtocolBufferException(string message)
-            : base(message)
-        {
-        }
-
-        internal InvalidProtocolBufferException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        internal static InvalidProtocolBufferException MoreDataAvailable()
-        {
-            return new InvalidProtocolBufferException(
-                "Completed reading a message while more data was available in the stream.");
-        }
-
-        internal static InvalidProtocolBufferException TruncatedMessage()
-        {
-            return new InvalidProtocolBufferException(
-                "While parsing a protocol message, the input ended unexpectedly " +
-                "in the middle of a field.  This could mean either than the " +
-                "input has been truncated or that an embedded message " +
-                "misreported its own length.");
-        }
-
-        internal static InvalidProtocolBufferException NegativeSize()
-        {
-            return new InvalidProtocolBufferException(
-                "CodedInputStream encountered an embedded string or message " +
-                "which claimed to have negative size.");
-        }
-
-        internal static InvalidProtocolBufferException MalformedVarint()
-        {
-            return new InvalidProtocolBufferException(
-                "CodedInputStream encountered a malformed varint.");
-        }
-
-        /// <summary>
-        /// Creates an exception for an error condition of an invalid tag being encountered.
-        /// </summary>
-        internal static InvalidProtocolBufferException InvalidTag()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message contained an invalid tag (zero).");
-        }
-
-        internal static InvalidProtocolBufferException InvalidBase64(Exception innerException)
-        {
-            return new InvalidProtocolBufferException("Invalid base64 data", innerException);
-        }
-
-        internal static InvalidProtocolBufferException InvalidEndTag()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message end-group tag did not match expected tag.");
-        }
-
-        internal static InvalidProtocolBufferException RecursionLimitExceeded()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message had too many levels of nesting.  May be malicious.  " +
-                "Use CodedInputStream.SetRecursionLimit() to increase the depth limit.");
-        }
-
-        internal static InvalidProtocolBufferException JsonRecursionLimitExceeded()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message had too many levels of nesting.  May be malicious.  " +
-                "Use JsonParser.Settings to increase the depth limit.");
-        }
-
-        internal static InvalidProtocolBufferException SizeLimitExceeded()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message was too large.  May be malicious.  " +
-                "Use CodedInputStream.SetSizeLimit() to increase the size limit.");
-        }
-
-        internal static InvalidProtocolBufferException InvalidMessageStreamTag()
-        {
-            return new InvalidProtocolBufferException(
-                "Stream of protocol messages had invalid tag. Expected tag is length-delimited field 1.");
-        }
-    }
-}

csharp/src/Google.Protobuf/JsonFormatter.cs

@@ -1,909 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Globalization;
-using System.Text;
-using Google.Protobuf.Reflection;
-using Google.Protobuf.WellKnownTypes;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Reflection-based converter from messages to JSON.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Instances of this class are thread-safe, with no mutable state.
-    /// </para>
-    /// <para>
-    /// This is a simple start to get JSON formatting working. As it's reflection-based,
-    /// it's not as quick as baking calls into generated messages - but is a simpler implementation.
-    /// (This code is generally not heavily optimized.)
-    /// </para>
-    /// </remarks>
-    public sealed class JsonFormatter
-    {
-        internal const string AnyTypeUrlField = "@type";
-        internal const string AnyDiagnosticValueField = "@value";
-        internal const string AnyWellKnownTypeValueField = "value";
-        private const string TypeUrlPrefix = "type.googleapis.com";
-        private const string NameValueSeparator = ": ";
-        private const string PropertySeparator = ", ";
-
-        /// <summary>
-        /// Returns a formatter using the default settings.
-        /// </summary>
-        public static JsonFormatter Default { get; } = new JsonFormatter(Settings.Default);
-
-        // A JSON formatter which *only* exists 
-        private static readonly JsonFormatter diagnosticFormatter = new JsonFormatter(Settings.Default);
-
-        /// <summary>
-        /// The JSON representation of the first 160 characters of Unicode.
-        /// Empty strings are replaced by the static constructor.
-        /// </summary>
-        private static readonly string[] CommonRepresentations = {
-            // C0 (ASCII and derivatives) control characters
-            "\\u0000", "\\u0001", "\\u0002", "\\u0003",  // 0x00
-          "\\u0004", "\\u0005", "\\u0006", "\\u0007",
-          "\\b",     "\\t",     "\\n",     "\\u000b",
-          "\\f",     "\\r",     "\\u000e", "\\u000f",
-          "\\u0010", "\\u0011", "\\u0012", "\\u0013",  // 0x10
-          "\\u0014", "\\u0015", "\\u0016", "\\u0017",
-          "\\u0018", "\\u0019", "\\u001a", "\\u001b",
-          "\\u001c", "\\u001d", "\\u001e", "\\u001f",
-            // Escaping of " and \ are required by www.json.org string definition.
-            // Escaping of < and > are required for HTML security.
-            "", "", "\\\"", "", "",        "", "",        "",  // 0x20
-          "", "", "",     "", "",        "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x30
-          "", "", "",     "", "\\u003c", "", "\\u003e", "",
-          "", "", "",     "", "",        "", "",        "",  // 0x40
-          "", "", "",     "", "",        "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x50
-          "", "", "",     "", "\\\\",    "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x60
-          "", "", "",     "", "",        "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x70
-          "", "", "",     "", "",        "", "",        "\\u007f",
-            // C1 (ISO 8859 and Unicode) extended control characters
-            "\\u0080", "\\u0081", "\\u0082", "\\u0083",  // 0x80
-          "\\u0084", "\\u0085", "\\u0086", "\\u0087",
-          "\\u0088", "\\u0089", "\\u008a", "\\u008b",
-          "\\u008c", "\\u008d", "\\u008e", "\\u008f",
-          "\\u0090", "\\u0091", "\\u0092", "\\u0093",  // 0x90
-          "\\u0094", "\\u0095", "\\u0096", "\\u0097",
-          "\\u0098", "\\u0099", "\\u009a", "\\u009b",
-          "\\u009c", "\\u009d", "\\u009e", "\\u009f"
-        };
-
-        static JsonFormatter()
-        {
-            for (int i = 0; i < CommonRepresentations.Length; i++)
-            {
-                if (CommonRepresentations[i] == "")
-                {
-                    CommonRepresentations[i] = ((char) i).ToString();
-                }
-            }
-        }
-
-        private readonly Settings settings;
-
-        private bool DiagnosticOnly => ReferenceEquals(this, diagnosticFormatter);
-
-        /// <summary>
-        /// Creates a new formatted with the given settings.
-        /// </summary>
-        /// <param name="settings">The settings.</param>
-        public JsonFormatter(Settings settings)
-        {
-            this.settings = settings;
-        }
-
-        /// <summary>
-        /// Formats the specified message as JSON.
-        /// </summary>
-        /// <param name="message">The message to format.</param>
-        /// <returns>The formatted message.</returns>
-        public string Format(IMessage message)
-        {
-            var writer = new StringWriter();
-            Format(message, writer);
-            return writer.ToString();
-        }
-
-        /// <summary>
-        /// Formats the specified message as JSON.
-        /// </summary>
-        /// <param name="message">The message to format.</param>
-        /// <param name="writer">The TextWriter to write the formatted message to.</param>
-        /// <returns>The formatted message.</returns>
-        public void Format(IMessage message, TextWriter writer)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-            ProtoPreconditions.CheckNotNull(writer, nameof(writer));
-
-            if (message.Descriptor.IsWellKnownType)
-            {
-                WriteWellKnownTypeValue(writer, message.Descriptor, message);
-            }
-            else
-            {
-                WriteMessage(writer, message);
-            }
-        }
-
-        /// <summary>
-        /// Converts a message to JSON for diagnostic purposes with no extra context.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This differs from calling <see cref="Format(IMessage)"/> on the default JSON
-        /// formatter in its handling of <see cref="Any"/>. As no type registry is available
-        /// in <see cref="object.ToString"/> calls, the normal way of resolving the type of
-        /// an <c>Any</c> message cannot be applied. Instead, a JSON property named <c>@value</c>
-        /// is included with the base64 data from the <see cref="Any.Value"/> property of the message.
-        /// </para>
-        /// <para>The value returned by this method is only designed to be used for diagnostic
-        /// purposes. It may not be parsable by <see cref="JsonParser"/>, and may not be parsable
-        /// by other Protocol Buffer implementations.</para>
-        /// </remarks>
-        /// <param name="message">The message to format for diagnostic purposes.</param>
-        /// <returns>The diagnostic-only JSON representation of the message</returns>
-        public static string ToDiagnosticString(IMessage message)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-            return diagnosticFormatter.Format(message);
-        }
-
-        private void WriteMessage(TextWriter writer, IMessage message)
-        {
-            if (message == null)
-            {
-                WriteNull(writer);
-                return;
-            }
-            if (DiagnosticOnly)
-            {
-                ICustomDiagnosticMessage customDiagnosticMessage = message as ICustomDiagnosticMessage;
-                if (customDiagnosticMessage != null)
-                {
-                    writer.Write(customDiagnosticMessage.ToDiagnosticString());
-                    return;
-                }
-            }
-            writer.Write("{ ");
-            bool writtenFields = WriteMessageFields(writer, message, false);
-            writer.Write(writtenFields ? " }" : "}");
-        }
-
-        private bool WriteMessageFields(TextWriter writer, IMessage message, bool assumeFirstFieldWritten)
-        {
-            var fields = message.Descriptor.Fields;
-            bool first = !assumeFirstFieldWritten;
-            // First non-oneof fields
-            foreach (var field in fields.InFieldNumberOrder())
-            {
-                var accessor = field.Accessor;
-                if (field.ContainingOneof != null && field.ContainingOneof.Accessor.GetCaseFieldDescriptor(message) != field)
-                {
-                    continue;
-                }
-                // Omit default values unless we're asked to format them, or they're oneofs (where the default
-                // value is still formatted regardless, because that's how we preserve the oneof case).
-                object value = accessor.GetValue(message);
-                if (field.ContainingOneof == null && !settings.FormatDefaultValues && IsDefaultValue(accessor, value))
-                {
-                    continue;
-                }
-
-                // Okay, all tests complete: let's write the field value...
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-
-                WriteString(writer, accessor.Descriptor.JsonName);
-                writer.Write(NameValueSeparator);
-                WriteValue(writer, value);
-
-                first = false;
-            }
-            return !first;
-        }
-
-        /// <summary>
-        /// Camel-case converter with added strictness for field mask formatting.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">The field mask is invalid for JSON representation</exception>
-        private static string ToCamelCaseForFieldMask(string input)
-        {
-            for (int i = 0; i < input.Length; i++)
-            {
-                char c = input[i];
-                if (c >= 'A' && c <= 'Z')
-                {
-                    throw new InvalidOperationException($"Invalid field mask to be converted to JSON: {input}");
-                }
-                if (c == '_' && i < input.Length - 1)
-                {
-                    char next = input[i + 1];
-                    if (next < 'a' || next > 'z')
-                    {
-                        throw new InvalidOperationException($"Invalid field mask to be converted to JSON: {input}");
-                    }
-                }
-            }
-            return ToCamelCase(input);
-        }
-
-        // Converted from src/google/protobuf/util/internal/utility.cc ToCamelCase
-        // TODO: Use the new field in FieldDescriptor.
-        internal static string ToCamelCase(string input)
-        {
-            bool capitalizeNext = false;
-            bool wasCap = true;
-            bool isCap = false;
-            bool firstWord = true;
-            StringBuilder result = new StringBuilder(input.Length);
-
-            for (int i = 0; i < input.Length; i++, wasCap = isCap)
-            {
-                isCap = char.IsUpper(input[i]);
-                if (input[i] == '_')
-                {
-                    capitalizeNext = true;
-                    if (result.Length != 0)
-                    {
-                        firstWord = false;
-                    }
-                    continue;
-                }
-                else if (firstWord)
-                {
-                    // Consider when the current character B is capitalized,
-                    // first word ends when:
-                    // 1) following a lowercase:   "...aB..."
-                    // 2) followed by a lowercase: "...ABc..."
-                    if (result.Length != 0 && isCap &&
-                        (!wasCap || (i + 1 < input.Length && char.IsLower(input[i + 1]))))
-                    {
-                        firstWord = false;
-                    }
-                    else
-                    {
-                        result.Append(char.ToLowerInvariant(input[i]));
-                        continue;
-                    }
-                }
-                else if (capitalizeNext)
-                {
-                    capitalizeNext = false;
-                    if (char.IsLower(input[i]))
-                    {
-                        result.Append(char.ToUpperInvariant(input[i]));
-                        continue;
-                    }
-                }
-                result.Append(input[i]);
-            }
-            return result.ToString();
-        }
-        
-        private static void WriteNull(TextWriter writer)
-        {
-            writer.Write("null");
-        }
-
-        private static bool IsDefaultValue(IFieldAccessor accessor, object value)
-        {
-            if (accessor.Descriptor.IsMap)
-            {
-                IDictionary dictionary = (IDictionary) value;
-                return dictionary.Count == 0;
-            }
-            if (accessor.Descriptor.IsRepeated)
-            {
-                IList list = (IList) value;
-                return list.Count == 0;
-            }
-            switch (accessor.Descriptor.FieldType)
-            {
-                case FieldType.Bool:
-                    return (bool) value == false;
-                case FieldType.Bytes:
-                    return (ByteString) value == ByteString.Empty;
-                case FieldType.String:
-                    return (string) value == "";
-                case FieldType.Double:
-                    return (double) value == 0.0;
-                case FieldType.SInt32:
-                case FieldType.Int32:
-                case FieldType.SFixed32:
-                case FieldType.Enum:
-                    return (int) value == 0;
-                case FieldType.Fixed32:
-                case FieldType.UInt32:
-                    return (uint) value == 0;
-                case FieldType.Fixed64:
-                case FieldType.UInt64:
-                    return (ulong) value == 0;
-                case FieldType.SFixed64:
-                case FieldType.Int64:
-                case FieldType.SInt64:
-                    return (long) value == 0;
-                case FieldType.Float:
-                    return (float) value == 0f;
-                case FieldType.Message:
-                case FieldType.Group: // Never expect to get this, but...
-                    return value == null;
-                default:
-                    throw new ArgumentException("Invalid field type");
-            }
-        }
-
-        /// <summary>
-        /// Writes a single value to the given writer as JSON. Only types understood by
-        /// Protocol Buffers can be written in this way. This method is only exposed for
-        /// advanced use cases; most users should be using <see cref="Format(IMessage)"/>
-        /// or <see cref="Format(IMessage, TextWriter)"/>.
-        /// </summary>
-        /// <param name="writer">The writer to write the value to. Must not be null.</param>
-        /// <param name="value">The value to write. May be null.</param>
-        public void WriteValue(TextWriter writer, object value)
-        {
-            if (value == null)
-            {
-                WriteNull(writer);
-            }
-            else if (value is bool)
-            {
-                writer.Write((bool)value ? "true" : "false");
-            }
-            else if (value is ByteString)
-            {
-                // Nothing in Base64 needs escaping
-                writer.Write('"');
-                writer.Write(((ByteString)value).ToBase64());
-                writer.Write('"');
-            }
-            else if (value is string)
-            {
-                WriteString(writer, (string)value);
-            }
-            else if (value is IDictionary)
-            {
-                WriteDictionary(writer, (IDictionary)value);
-            }
-            else if (value is IList)
-            {
-                WriteList(writer, (IList)value);
-            }
-            else if (value is int || value is uint)
-            {
-                IFormattable formattable = (IFormattable) value;
-                writer.Write(formattable.ToString("d", CultureInfo.InvariantCulture));
-            }
-            else if (value is long || value is ulong)
-            {
-                writer.Write('"');
-                IFormattable formattable = (IFormattable) value;
-                writer.Write(formattable.ToString("d", CultureInfo.InvariantCulture));
-                writer.Write('"');
-            }
-            else if (value is System.Enum)
-            {
-                string name = OriginalEnumValueHelper.GetOriginalName(value);
-                if (name != null)
-                {
-                    WriteString(writer, name);
-                }
-                else
-                {
-                    WriteValue(writer, (int)value);
-                }
-            }
-            else if (value is float || value is double)
-            {
-                string text = ((IFormattable) value).ToString("r", CultureInfo.InvariantCulture);
-                if (text == "NaN" || text == "Infinity" || text == "-Infinity")
-                {
-                    writer.Write('"');
-                    writer.Write(text);
-                    writer.Write('"');
-                }
-                else
-                {
-                    writer.Write(text);
-                }
-            }
-            else if (value is IMessage)
-            {
-                Format((IMessage)value, writer);
-            }
-            else
-            {
-                throw new ArgumentException("Unable to format value of type " + value.GetType());
-            }
-        }
-
-        /// <summary>
-        /// Central interception point for well-known type formatting. Any well-known types which
-        /// don't need special handling can fall back to WriteMessage. We avoid assuming that the
-        /// values are using the embedded well-known types, in order to allow for dynamic messages
-        /// in the future.
-        /// </summary>
-        private void WriteWellKnownTypeValue(TextWriter writer, MessageDescriptor descriptor, object value)
-        {
-            // Currently, we can never actually get here, because null values are always handled by the caller. But if we *could*,
-            // this would do the right thing.
-            if (value == null)
-            {
-                WriteNull(writer);
-                return;
-            }
-            // For wrapper types, the value will either be the (possibly boxed) "native" value,
-            // or the message itself if we're formatting it at the top level (e.g. just calling ToString on the object itself).
-            // If it's the message form, we can extract the value first, which *will* be the (possibly boxed) native value,
-            // and then proceed, writing it as if we were definitely in a field. (We never need to wrap it in an extra string...
-            // WriteValue will do the right thing.)
-            if (descriptor.IsWrapperType)
-            {
-                if (value is IMessage)
-                {
-                    var message = (IMessage) value;
-                    value = message.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.GetValue(message);
-                }
-                WriteValue(writer, value);
-                return;
-            }
-            if (descriptor.FullName == Timestamp.Descriptor.FullName)
-            {
-                WriteTimestamp(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == Duration.Descriptor.FullName)
-            {
-                WriteDuration(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == FieldMask.Descriptor.FullName)
-            {
-                WriteFieldMask(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == Struct.Descriptor.FullName)
-            {
-                WriteStruct(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == ListValue.Descriptor.FullName)
-            {
-                var fieldAccessor = descriptor.Fields[ListValue.ValuesFieldNumber].Accessor;
-                WriteList(writer, (IList)fieldAccessor.GetValue((IMessage)value));
-                return;
-            }
-            if (descriptor.FullName == Value.Descriptor.FullName)
-            {
-                WriteStructFieldValue(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == Any.Descriptor.FullName)
-            {
-                WriteAny(writer, (IMessage)value);
-                return;
-            }
-            WriteMessage(writer, (IMessage)value);
-        }
-
-        private void WriteTimestamp(TextWriter writer, IMessage value)
-        {
-            // TODO: In the common case where this *is* using the built-in Timestamp type, we could
-            // avoid all the reflection at this point, by casting to Timestamp. In the interests of
-            // avoiding subtle bugs, don't do that until we've implemented DynamicMessage so that we can prove
-            // it still works in that case.
-            int nanos = (int) value.Descriptor.Fields[Timestamp.NanosFieldNumber].Accessor.GetValue(value);
-            long seconds = (long) value.Descriptor.Fields[Timestamp.SecondsFieldNumber].Accessor.GetValue(value);
-            writer.Write(Timestamp.ToJson(seconds, nanos, DiagnosticOnly));
-        }
-
-        private void WriteDuration(TextWriter writer, IMessage value)
-        {
-            // TODO: Same as for WriteTimestamp
-            int nanos = (int) value.Descriptor.Fields[Duration.NanosFieldNumber].Accessor.GetValue(value);
-            long seconds = (long) value.Descriptor.Fields[Duration.SecondsFieldNumber].Accessor.GetValue(value);
-            writer.Write(Duration.ToJson(seconds, nanos, DiagnosticOnly));
-        }
-
-        private void WriteFieldMask(TextWriter writer, IMessage value)
-        {
-            var paths = (IList<string>) value.Descriptor.Fields[FieldMask.PathsFieldNumber].Accessor.GetValue(value);
-            writer.Write(FieldMask.ToJson(paths, DiagnosticOnly));
-        }
-
-        private void WriteAny(TextWriter writer, IMessage value)
-        {
-            if (DiagnosticOnly)
-            {
-                WriteDiagnosticOnlyAny(writer, value);
-                return;
-            }
-
-            string typeUrl = (string) value.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.GetValue(value);
-            ByteString data = (ByteString) value.Descriptor.Fields[Any.ValueFieldNumber].Accessor.GetValue(value);
-            string typeName = Any.GetTypeName(typeUrl);
-            MessageDescriptor descriptor = settings.TypeRegistry.Find(typeName);
-            if (descriptor == null)
-            {
-                throw new InvalidOperationException($"Type registry has no descriptor for type name '{typeName}'");
-            }
-            IMessage message = descriptor.Parser.ParseFrom(data);
-            writer.Write("{ ");
-            WriteString(writer, AnyTypeUrlField);
-            writer.Write(NameValueSeparator);
-            WriteString(writer, typeUrl);
-
-            if (descriptor.IsWellKnownType)
-            {
-                writer.Write(PropertySeparator);
-                WriteString(writer, AnyWellKnownTypeValueField);
-                writer.Write(NameValueSeparator);
-                WriteWellKnownTypeValue(writer, descriptor, message);
-            }
-            else
-            {
-                WriteMessageFields(writer, message, true);
-            }
-            writer.Write(" }");
-        }
-
-        private void WriteDiagnosticOnlyAny(TextWriter writer, IMessage value)
-        {
-            string typeUrl = (string) value.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.GetValue(value);
-            ByteString data = (ByteString) value.Descriptor.Fields[Any.ValueFieldNumber].Accessor.GetValue(value);
-            writer.Write("{ ");
-            WriteString(writer, AnyTypeUrlField);
-            writer.Write(NameValueSeparator);
-            WriteString(writer, typeUrl);
-            writer.Write(PropertySeparator);
-            WriteString(writer, AnyDiagnosticValueField);
-            writer.Write(NameValueSeparator);
-            writer.Write('"');
-            writer.Write(data.ToBase64());
-            writer.Write('"');
-            writer.Write(" }");
-        }        
-
-        private void WriteStruct(TextWriter writer, IMessage message)
-        {
-            writer.Write("{ ");
-            IDictionary fields = (IDictionary) message.Descriptor.Fields[Struct.FieldsFieldNumber].Accessor.GetValue(message);
-            bool first = true;
-            foreach (DictionaryEntry entry in fields)
-            {
-                string key = (string) entry.Key;
-                IMessage value = (IMessage) entry.Value;
-                if (string.IsNullOrEmpty(key) || value == null)
-                {
-                    throw new InvalidOperationException("Struct fields cannot have an empty key or a null value.");
-                }
-
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-                WriteString(writer, key);
-                writer.Write(NameValueSeparator);
-                WriteStructFieldValue(writer, value);
-                first = false;
-            }
-            writer.Write(first ? "}" : " }");
-        }
-
-        private void WriteStructFieldValue(TextWriter writer, IMessage message)
-        {
-            var specifiedField = message.Descriptor.Oneofs[0].Accessor.GetCaseFieldDescriptor(message);
-            if (specifiedField == null)
-            {
-                throw new InvalidOperationException("Value message must contain a value for the oneof.");
-            }
-
-            object value = specifiedField.Accessor.GetValue(message);
-            
-            switch (specifiedField.FieldNumber)
-            {
-                case Value.BoolValueFieldNumber:
-                case Value.StringValueFieldNumber:
-                case Value.NumberValueFieldNumber:
-                    WriteValue(writer, value);
-                    return;
-                case Value.StructValueFieldNumber:
-                case Value.ListValueFieldNumber:
-                    // Structs and ListValues are nested messages, and already well-known types.
-                    var nestedMessage = (IMessage) specifiedField.Accessor.GetValue(message);
-                    WriteWellKnownTypeValue(writer, nestedMessage.Descriptor, nestedMessage);
-                    return;
-                case Value.NullValueFieldNumber:
-                    WriteNull(writer);
-                    return;
-                default:
-                    throw new InvalidOperationException("Unexpected case in struct field: " + specifiedField.FieldNumber);
-            }
-        }
-
-        internal void WriteList(TextWriter writer, IList list)
-        {
-            writer.Write("[ ");
-            bool first = true;
-            foreach (var value in list)
-            {
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-                WriteValue(writer, value);
-                first = false;
-            }
-            writer.Write(first ? "]" : " ]");
-        }
-
-        internal void WriteDictionary(TextWriter writer, IDictionary dictionary)
-        {
-            writer.Write("{ ");
-            bool first = true;
-            // This will box each pair. Could use IDictionaryEnumerator, but that's ugly in terms of disposal.
-            foreach (DictionaryEntry pair in dictionary)
-            {
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-                string keyText;
-                if (pair.Key is string)
-                {
-                    keyText = (string) pair.Key;
-                }
-                else if (pair.Key is bool)
-                {
-                    keyText = (bool) pair.Key ? "true" : "false";
-                }
-                else if (pair.Key is int || pair.Key is uint | pair.Key is long || pair.Key is ulong)
-                {
-                    keyText = ((IFormattable) pair.Key).ToString("d", CultureInfo.InvariantCulture);
-                }
-                else
-                {
-                    if (pair.Key == null)
-                    {
-                        throw new ArgumentException("Dictionary has entry with null key");
-                    }
-                    throw new ArgumentException("Unhandled dictionary key type: " + pair.Key.GetType());
-                }
-                WriteString(writer, keyText);
-                writer.Write(NameValueSeparator);
-                WriteValue(writer, pair.Value);
-                first = false;
-            }
-            writer.Write(first ? "}" : " }");
-        }
-
-        /// <summary>
-        /// Writes a string (including leading and trailing double quotes) to a builder, escaping as required.
-        /// </summary>
-        /// <remarks>
-        /// Other than surrogate pair handling, this code is mostly taken from src/google/protobuf/util/internal/json_escaping.cc.
-        /// </remarks>
-        internal static void WriteString(TextWriter writer, string text)
-        {
-            writer.Write('"');
-            for (int i = 0; i < text.Length; i++)
-            {
-                char c = text[i];
-                if (c < 0xa0)
-                {
-                    writer.Write(CommonRepresentations[c]);
-                    continue;
-                }
-                if (char.IsHighSurrogate(c))
-                {
-                    // Encountered first part of a surrogate pair.
-                    // Check that we have the whole pair, and encode both parts as hex.
-                    i++;
-                    if (i == text.Length || !char.IsLowSurrogate(text[i]))
-                    {
-                        throw new ArgumentException("String contains low surrogate not followed by high surrogate");
-                    }
-                    HexEncodeUtf16CodeUnit(writer, c);
-                    HexEncodeUtf16CodeUnit(writer, text[i]);
-                    continue;
-                }
-                else if (char.IsLowSurrogate(c))
-                {
-                    throw new ArgumentException("String contains high surrogate not preceded by low surrogate");
-                }
-                switch ((uint) c)
-                {
-                    // These are not required by json spec
-                    // but used to prevent security bugs in javascript.
-                    case 0xfeff:  // Zero width no-break space
-                    case 0xfff9:  // Interlinear annotation anchor
-                    case 0xfffa:  // Interlinear annotation separator
-                    case 0xfffb:  // Interlinear annotation terminator
-
-                    case 0x00ad:  // Soft-hyphen
-                    case 0x06dd:  // Arabic end of ayah
-                    case 0x070f:  // Syriac abbreviation mark
-                    case 0x17b4:  // Khmer vowel inherent Aq
-                    case 0x17b5:  // Khmer vowel inherent Aa
-                        HexEncodeUtf16CodeUnit(writer, c);
-                        break;
-
-                    default:
-                        if ((c >= 0x0600 && c <= 0x0603) ||  // Arabic signs
-                            (c >= 0x200b && c <= 0x200f) ||  // Zero width etc.
-                            (c >= 0x2028 && c <= 0x202e) ||  // Separators etc.
-                            (c >= 0x2060 && c <= 0x2064) ||  // Invisible etc.
-                            (c >= 0x206a && c <= 0x206f))
-                        {
-                            HexEncodeUtf16CodeUnit(writer, c);
-                        }
-                        else
-                        {
-                            // No handling of surrogates here - that's done earlier
-                            writer.Write(c);
-                        }
-                        break;
-                }
-            }
-            writer.Write('"');
-        }
-
-        private const string Hex = "0123456789abcdef";
-        private static void HexEncodeUtf16CodeUnit(TextWriter writer, char c)
-        {
-            writer.Write("\\u");
-            writer.Write(Hex[(c >> 12) & 0xf]);
-            writer.Write(Hex[(c >> 8) & 0xf]);
-            writer.Write(Hex[(c >> 4) & 0xf]);
-            writer.Write(Hex[(c >> 0) & 0xf]);
-        }
-
-        /// <summary>
-        /// Settings controlling JSON formatting.
-        /// </summary>
-        public sealed class Settings
-        {
-            /// <summary>
-            /// Default settings, as used by <see cref="JsonFormatter.Default"/>
-            /// </summary>
-            public static Settings Default { get; }
-
-            // Workaround for the Mono compiler complaining about XML comments not being on
-            // valid language elements.
-            static Settings()
-            {
-                Default = new Settings(false);
-            }
-
-            /// <summary>
-            /// Whether fields whose values are the default for the field type (e.g. 0 for integers)
-            /// should be formatted (true) or omitted (false).
-            /// </summary>
-            public bool FormatDefaultValues { get; }
-
-            /// <summary>
-            /// The type registry used to format <see cref="Any"/> messages.
-            /// </summary>
-            public TypeRegistry TypeRegistry { get; }
-
-            // TODO: Work out how we're going to scale this to multiple settings. "WithXyz" methods?
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified formatting of default values
-            /// and an empty type registry.
-            /// </summary>
-            /// <param name="formatDefaultValues"><c>true</c> if default values (0, empty strings etc) should be formatted; <c>false</c> otherwise.</param>
-            public Settings(bool formatDefaultValues) : this(formatDefaultValues, TypeRegistry.Empty)
-            {
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified formatting of default values
-            /// and type registry.
-            /// </summary>
-            /// <param name="formatDefaultValues"><c>true</c> if default values (0, empty strings etc) should be formatted; <c>false</c> otherwise.</param>
-            /// <param name="typeRegistry">The <see cref="TypeRegistry"/> to use when formatting <see cref="Any"/> messages.</param>
-            public Settings(bool formatDefaultValues, TypeRegistry typeRegistry)
-            {
-                FormatDefaultValues = formatDefaultValues;
-                TypeRegistry = ProtoPreconditions.CheckNotNull(typeRegistry, nameof(typeRegistry));
-            }
-        }
-
-        // Effectively a cache of mapping from enum values to the original name as specified in the proto file,
-        // fetched by reflection.
-        // The need for this is unfortunate, as is its unbounded size, but realistically it shouldn't cause issues.
-        private static class OriginalEnumValueHelper
-        {
-            // TODO: In the future we might want to use ConcurrentDictionary, at the point where all
-            // the platforms we target have it.
-            private static readonly Dictionary<System.Type, Dictionary<object, string>> dictionaries
-                = new Dictionary<System.Type, Dictionary<object, string>>();
-            
-            internal static string GetOriginalName(object value)
-            {
-                var enumType = value.GetType();
-                Dictionary<object, string> nameMapping;
-                lock (dictionaries)
-                {
-                    if (!dictionaries.TryGetValue(enumType, out nameMapping))
-                    {
-                        nameMapping = GetNameMapping(enumType);
-                        dictionaries[enumType] = nameMapping;
-                    }
-                }
-
-                string originalName;
-                // If this returns false, originalName will be null, which is what we want.
-                nameMapping.TryGetValue(value, out originalName);
-                return originalName;
-            }
-
-#if DOTNET35
-            // TODO: Consider adding functionality to TypeExtensions to avoid this difference.
-            private static Dictionary<object, string> GetNameMapping(System.Type enumType) =>
-                enumType.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static)
-                    .ToDictionary(f => f.GetValue(null),
-                                  f => (f.GetCustomAttributes(typeof(OriginalNameAttribute), false)
-                                        .FirstOrDefault() as OriginalNameAttribute)
-                                        // If the attribute hasn't been applied, fall back to the name of the field.
-                                        ?.Name ?? f.Name);
-#else
-            private static Dictionary<object, string> GetNameMapping(System.Type enumType) =>
-                enumType.GetTypeInfo().DeclaredFields
-                    .Where(f => f.IsStatic)
-                    .ToDictionary(f => f.GetValue(null),
-                                  f => f.GetCustomAttributes<OriginalNameAttribute>()
-                                        .FirstOrDefault()
-                                        // If the attribute hasn't been applied, fall back to the name of the field.
-                                        ?.Name ?? f.Name);
-#endif
-        }
-    }
-}

csharp/src/Google.Protobuf/JsonToken.cs

@@ -1,166 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    internal sealed class JsonToken : IEquatable<JsonToken>
-    {
-        // Tokens with no value can be reused.
-        private static readonly JsonToken _true = new JsonToken(TokenType.True);
-        private static readonly JsonToken _false = new JsonToken(TokenType.False);
-        private static readonly JsonToken _null = new JsonToken(TokenType.Null);
-        private static readonly JsonToken startObject = new JsonToken(TokenType.StartObject);
-        private static readonly JsonToken endObject = new JsonToken(TokenType.EndObject);
-        private static readonly JsonToken startArray = new JsonToken(TokenType.StartArray);
-        private static readonly JsonToken endArray = new JsonToken(TokenType.EndArray);
-        private static readonly JsonToken endDocument = new JsonToken(TokenType.EndDocument);
-
-        internal static JsonToken Null { get { return _null; } }
-        internal static JsonToken False { get { return _false; } }
-        internal static JsonToken True { get { return _true; } }
-        internal static JsonToken StartObject{ get { return startObject; } }
-        internal static JsonToken EndObject { get { return endObject; } }
-        internal static JsonToken StartArray { get { return startArray; } }
-        internal static JsonToken EndArray { get { return endArray; } }
-        internal static JsonToken EndDocument { get { return endDocument; } }
-
-        internal static JsonToken Name(string name)
-        {
-            return new JsonToken(TokenType.Name, stringValue: name);
-        }
-
-        internal static JsonToken Value(string value)
-        {
-            return new JsonToken(TokenType.StringValue, stringValue: value);
-        }
-
-        internal static JsonToken Value(double value)
-        {
-            return new JsonToken(TokenType.Number, numberValue: value);
-        }
-
-        internal enum TokenType
-        {
-            Null,
-            False,
-            True,
-            StringValue,
-            Number,
-            Name,
-            StartObject,
-            EndObject,
-            StartArray,
-            EndArray,
-            EndDocument
-        }
-
-        // A value is a string, number, array, object, null, true or false
-        // Arrays and objects have start/end
-        // A document consists of a value
-        // Objects are name/value sequences.
-
-        private readonly TokenType type;
-        private readonly string stringValue;
-        private readonly double numberValue;
-
-        internal TokenType Type { get { return type; } }
-        internal string StringValue { get { return stringValue; } }
-        internal double NumberValue { get { return numberValue; } }
-
-        private JsonToken(TokenType type, string stringValue = null, double numberValue = 0)
-        {
-            this.type = type;
-            this.stringValue = stringValue;
-            this.numberValue = numberValue;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as JsonToken);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = hash * 31 + (int) type;
-                hash = hash * 31 + stringValue == null ? 0 : stringValue.GetHashCode();
-                hash = hash * 31 + numberValue.GetHashCode();
-                return hash;
-            }
-        }
-
-        public override string ToString()
-        {
-            switch (type)
-            {
-                case TokenType.Null:
-                    return "null";
-                case TokenType.True:
-                    return "true";
-                case TokenType.False:
-                    return "false";
-                case TokenType.Name:
-                    return "name (" + stringValue + ")";
-                case TokenType.StringValue:
-                    return "value (" + stringValue + ")";
-                case TokenType.Number:
-                    return "number (" + numberValue + ")";
-                case TokenType.StartObject:
-                    return "start-object";
-                case TokenType.EndObject:
-                    return "end-object";
-                case TokenType.StartArray:
-                    return "start-array";
-                case TokenType.EndArray:
-                    return "end-array";
-                case TokenType.EndDocument:
-                    return "end-document";
-                default:
-                    throw new InvalidOperationException("Token is of unknown type " + type);
-            }
-        }
-
-        public bool Equals(JsonToken other)
-        {
-            if (ReferenceEquals(other, null))
-            {
-                return false;
-            }
-            // Note use of other.numberValue.Equals rather than ==, so that NaN compares appropriately.
-            return other.type == type && other.stringValue == stringValue && other.numberValue.Equals(numberValue);
-        }
-    }
-}

csharp/src/Google.Protobuf/JsonTokenizer.cs

@@ -1,738 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Simple but strict JSON tokenizer, rigidly following RFC 7159.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This tokenizer is stateful, and only returns "useful" tokens - names, values etc.
-    /// It does not create tokens for the separator between names and values, or for the comma
-    /// between values. It validates the token stream as it goes - so callers can assume that the
-    /// tokens it produces are appropriate. For example, it would never produce "start object, end array."
-    /// </para>
-    /// <para>Implementation details: the base class handles single token push-back and </para>
-    /// <para>Not thread-safe.</para>
-    /// </remarks>
-    internal abstract class JsonTokenizer
-    {
-        private JsonToken bufferedToken;
-
-        /// <summary>
-        ///  Creates a tokenizer that reads from the given text reader.
-        /// </summary>
-        internal static JsonTokenizer FromTextReader(TextReader reader)
-        {
-            return new JsonTextTokenizer(reader);
-        }
-
-        /// <summary>
-        /// Creates a tokenizer that first replays the given list of tokens, then continues reading
-        /// from another tokenizer. Note that if the returned tokenizer is "pushed back", that does not push back
-        /// on the continuation tokenizer, or vice versa. Care should be taken when using this method - it was
-        /// created for the sake of Any parsing.
-        /// </summary>
-        internal static JsonTokenizer FromReplayedTokens(IList<JsonToken> tokens, JsonTokenizer continuation)
-        {
-            return new JsonReplayTokenizer(tokens, continuation);
-        }
-
-        /// <summary>
-        /// Returns the depth of the stack, purely in objects (not collections).
-        /// Informally, this is the number of remaining unclosed '{' characters we have.
-        /// </summary>
-        internal int ObjectDepth { get; private set; }
-
-        // TODO: Why do we allow a different token to be pushed back? It might be better to always remember the previous
-        // token returned, and allow a parameterless Rewind() method (which could only be called once, just like the current PushBack).
-        internal void PushBack(JsonToken token)
-        {
-            if (bufferedToken != null)
-            {
-                throw new InvalidOperationException("Can't push back twice");
-            }
-            bufferedToken = token;
-            if (token.Type == JsonToken.TokenType.StartObject)
-            {
-                ObjectDepth--;
-            }
-            else if (token.Type == JsonToken.TokenType.EndObject)
-            {
-                ObjectDepth++;
-            }
-        }
-
-        /// <summary>
-        /// Returns the next JSON token in the stream. An EndDocument token is returned to indicate the end of the stream,
-        /// after which point <c>Next()</c> should not be called again.
-        /// </summary>
-        /// <remarks>This implementation provides single-token buffering, and calls <see cref="NextImpl"/> if there is no buffered token.</remarks>
-        /// <returns>The next token in the stream. This is never null.</returns>
-        /// <exception cref="InvalidOperationException">This method is called after an EndDocument token has been returned</exception>
-        /// <exception cref="InvalidJsonException">The input text does not comply with RFC 7159</exception>
-        internal JsonToken Next()
-        {
-            JsonToken tokenToReturn;
-            if (bufferedToken != null)
-            {
-                tokenToReturn = bufferedToken;
-                bufferedToken = null;
-            }
-            else
-            {
-                tokenToReturn = NextImpl();
-            }
-            if (tokenToReturn.Type == JsonToken.TokenType.StartObject)
-            {
-                ObjectDepth++;
-            }
-            else if (tokenToReturn.Type == JsonToken.TokenType.EndObject)
-            {
-                ObjectDepth--;
-            }
-            return tokenToReturn;
-        }
-
-        /// <summary>
-        /// Returns the next JSON token in the stream, when requested by the base class. (The <see cref="Next"/> method delegates
-        /// to this if it doesn't have a buffered token.)
-        /// </summary>
-        /// <exception cref="InvalidOperationException">This method is called after an EndDocument token has been returned</exception>
-        /// <exception cref="InvalidJsonException">The input text does not comply with RFC 7159</exception>
-        protected abstract JsonToken NextImpl();
-
-        /// <summary>
-        /// Tokenizer which first exhausts a list of tokens, then consults another tokenizer.
-        /// </summary>
-        private class JsonReplayTokenizer : JsonTokenizer
-        {
-            private readonly IList<JsonToken> tokens;
-            private readonly JsonTokenizer nextTokenizer;
-            private int nextTokenIndex;
-
-            internal JsonReplayTokenizer(IList<JsonToken> tokens, JsonTokenizer nextTokenizer)
-            {
-                this.tokens = tokens;
-                this.nextTokenizer = nextTokenizer;
-            }
-
-            // FIXME: Object depth not maintained...
-            protected override JsonToken NextImpl()
-            {
-                if (nextTokenIndex >= tokens.Count)
-                {
-                    return nextTokenizer.Next();
-                }
-                return tokens[nextTokenIndex++];
-            }
-        }
-
-        /// <summary>
-        /// Tokenizer which does all the *real* work of parsing JSON.
-        /// </summary>
-        private sealed class JsonTextTokenizer : JsonTokenizer
-        {
-            // The set of states in which a value is valid next token.
-            private static readonly State ValueStates = State.ArrayStart | State.ArrayAfterComma | State.ObjectAfterColon | State.StartOfDocument;
-
-            private readonly Stack<ContainerType> containerStack = new Stack<ContainerType>();
-            private readonly PushBackReader reader;
-            private State state;
-
-            internal JsonTextTokenizer(TextReader reader)
-            {
-                this.reader = new PushBackReader(reader);
-                state = State.StartOfDocument;
-                containerStack.Push(ContainerType.Document);
-            }
-
-            /// <remarks>
-            /// This method essentially just loops through characters skipping whitespace, validating and
-            /// changing state (e.g. from ObjectBeforeColon to ObjectAfterColon)
-            /// until it reaches something which will be a genuine token (e.g. a start object, or a value) at which point
-            /// it returns the token. Although the method is large, it would be relatively hard to break down further... most
-            /// of it is the large switch statement, which sometimes returns and sometimes doesn't.
-            /// </remarks>
-            protected override JsonToken NextImpl()
-            {
-                if (state == State.ReaderExhausted)
-                {
-                    throw new InvalidOperationException("Next() called after end of document");
-                }
-                while (true)
-                {
-                    var next = reader.Read();
-                    if (next == null)
-                    {
-                        ValidateState(State.ExpectedEndOfDocument, "Unexpected end of document in state: ");
-                        state = State.ReaderExhausted;
-                        return JsonToken.EndDocument;
-                    }
-                    switch (next.Value)
-                    {
-                        // Skip whitespace between tokens
-                        case ' ':
-                        case '\t':
-                        case '\r':
-                        case '\n':
-                            break;
-                        case ':':
-                            ValidateState(State.ObjectBeforeColon, "Invalid state to read a colon: ");
-                            state = State.ObjectAfterColon;
-                            break;
-                        case ',':
-                            ValidateState(State.ObjectAfterProperty | State.ArrayAfterValue, "Invalid state to read a colon: ");
-                            state = state == State.ObjectAfterProperty ? State.ObjectAfterComma : State.ArrayAfterComma;
-                            break;
-                        case '"':
-                            string stringValue = ReadString();
-                            if ((state & (State.ObjectStart | State.ObjectAfterComma)) != 0)
-                            {
-                                state = State.ObjectBeforeColon;
-                                return JsonToken.Name(stringValue);
-                            }
-                            else
-                            {
-                                ValidateAndModifyStateForValue("Invalid state to read a double quote: ");
-                                return JsonToken.Value(stringValue);
-                            }
-                        case '{':
-                            ValidateState(ValueStates, "Invalid state to read an open brace: ");
-                            state = State.ObjectStart;
-                            containerStack.Push(ContainerType.Object);
-                            return JsonToken.StartObject;
-                        case '}':
-                            ValidateState(State.ObjectAfterProperty | State.ObjectStart, "Invalid state to read a close brace: ");
-                            PopContainer();
-                            return JsonToken.EndObject;
-                        case '[':
-                            ValidateState(ValueStates, "Invalid state to read an open square bracket: ");
-                            state = State.ArrayStart;
-                            containerStack.Push(ContainerType.Array);
-                            return JsonToken.StartArray;
-                        case ']':
-                            ValidateState(State.ArrayAfterValue | State.ArrayStart, "Invalid state to read a close square bracket: ");
-                            PopContainer();
-                            return JsonToken.EndArray;
-                        case 'n': // Start of null
-                            ConsumeLiteral("null");
-                            ValidateAndModifyStateForValue("Invalid state to read a null literal: ");
-                            return JsonToken.Null;
-                        case 't': // Start of true
-                            ConsumeLiteral("true");
-                            ValidateAndModifyStateForValue("Invalid state to read a true literal: ");
-                            return JsonToken.True;
-                        case 'f': // Start of false
-                            ConsumeLiteral("false");
-                            ValidateAndModifyStateForValue("Invalid state to read a false literal: ");
-                            return JsonToken.False;
-                        case '-': // Start of a number
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            double number = ReadNumber(next.Value);
-                            ValidateAndModifyStateForValue("Invalid state to read a number token: ");
-                            return JsonToken.Value(number);
-                        default:
-                            throw new InvalidJsonException("Invalid first character of token: " + next.Value);
-                    }
-                }
-            }
-
-            private void ValidateState(State validStates, string errorPrefix)
-            {
-                if ((validStates & state) == 0)
-                {
-                    throw reader.CreateException(errorPrefix + state);
-                }
-            }
-
-            /// <summary>
-            /// Reads a string token. It is assumed that the opening " has already been read.
-            /// </summary>
-            private string ReadString()
-            {
-                var value = new StringBuilder();
-                bool haveHighSurrogate = false;
-                while (true)
-                {
-                    char c = reader.ReadOrFail("Unexpected end of text while reading string");
-                    if (c < ' ')
-                    {
-                        throw reader.CreateException(string.Format(CultureInfo.InvariantCulture, "Invalid character in string literal: U+{0:x4}", (int) c));
-                    }
-                    if (c == '"')
-                    {
-                        if (haveHighSurrogate)
-                        {
-                            throw reader.CreateException("Invalid use of surrogate pair code units");
-                        }
-                        return value.ToString();
-                    }
-                    if (c == '\\')
-                    {
-                        c = ReadEscapedCharacter();
-                    }
-                    // TODO: Consider only allowing surrogate pairs that are either both escaped,
-                    // or both not escaped. It would be a very odd text stream that contained a "lone" high surrogate
-                    // followed by an escaped low surrogate or vice versa... and that couldn't even be represented in UTF-8.
-                    if (haveHighSurrogate != char.IsLowSurrogate(c))
-                    {
-                        throw reader.CreateException("Invalid use of surrogate pair code units");
-                    }
-                    haveHighSurrogate = char.IsHighSurrogate(c);
-                    value.Append(c);
-                }
-            }
-
-            /// <summary>
-            /// Reads an escaped character. It is assumed that the leading backslash has already been read.
-            /// </summary>
-            private char ReadEscapedCharacter()
-            {
-                char c = reader.ReadOrFail("Unexpected end of text while reading character escape sequence");
-                switch (c)
-                {
-                    case 'n':
-                        return '\n';
-                    case '\\':
-                        return '\\';
-                    case 'b':
-                        return '\b';
-                    case 'f':
-                        return '\f';
-                    case 'r':
-                        return '\r';
-                    case 't':
-                        return '\t';
-                    case '"':
-                        return '"';
-                    case '/':
-                        return '/';
-                    case 'u':
-                        return ReadUnicodeEscape();
-                    default:
-                        throw reader.CreateException(string.Format(CultureInfo.InvariantCulture, "Invalid character in character escape sequence: U+{0:x4}", (int) c));
-                }
-            }
-
-            /// <summary>
-            /// Reads an escaped Unicode 4-nybble hex sequence. It is assumed that the leading \u has already been read.
-            /// </summary>
-            private char ReadUnicodeEscape()
-            {
-                int result = 0;
-                for (int i = 0; i < 4; i++)
-                {
-                    char c = reader.ReadOrFail("Unexpected end of text while reading Unicode escape sequence");
-                    int nybble;
-                    if (c >= '0' && c <= '9')
-                    {
-                        nybble = c - '0';
-                    }
-                    else if (c >= 'a' && c <= 'f')
-                    {
-                        nybble = c - 'a' + 10;
-                    }
-                    else if (c >= 'A' && c <= 'F')
-                    {
-                        nybble = c - 'A' + 10;
-                    }
-                    else
-                    {
-                        throw reader.CreateException(string.Format(CultureInfo.InvariantCulture, "Invalid character in character escape sequence: U+{0:x4}", (int) c));
-                    }
-                    result = (result << 4) + nybble;
-                }
-                return (char) result;
-            }
-
-            /// <summary>
-            /// Consumes a text-only literal, throwing an exception if the read text doesn't match it.
-            /// It is assumed that the first letter of the literal has already been read.
-            /// </summary>
-            private void ConsumeLiteral(string text)
-            {
-                for (int i = 1; i < text.Length; i++)
-                {
-                    char? next = reader.Read();
-                    if (next == null)
-                    {
-                        throw reader.CreateException("Unexpected end of text while reading literal token " + text);
-                    }
-                    if (next.Value != text[i])
-                    {
-                        throw reader.CreateException("Unexpected character while reading literal token " + text);
-                    }
-                }
-            }
-
-            private double ReadNumber(char initialCharacter)
-            {
-                StringBuilder builder = new StringBuilder();
-                if (initialCharacter == '-')
-                {
-                    builder.Append("-");
-                }
-                else
-                {
-                    reader.PushBack(initialCharacter);
-                }
-                // Each method returns the character it read that doesn't belong in that part,
-                // so we know what to do next, including pushing the character back at the end.
-                // null is returned for "end of text".
-                char? next = ReadInt(builder);
-                if (next == '.')
-                {
-                    next = ReadFrac(builder);
-                }
-                if (next == 'e' || next == 'E')
-                {
-                    next = ReadExp(builder);
-                }
-                // If we read a character which wasn't part of the number, push it back so we can read it again
-                // to parse the next token.
-                if (next != null)
-                {
-                    reader.PushBack(next.Value);
-                }
-
-                // TODO: What exception should we throw if the value can't be represented as a double?
-                try
-                {
-                    return double.Parse(builder.ToString(),
-                        NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent,
-                        CultureInfo.InvariantCulture);
-                }
-                catch (OverflowException)
-                {
-                    throw reader.CreateException("Numeric value out of range: " + builder);
-                }
-            }
-
-            private char? ReadInt(StringBuilder builder)
-            {
-                char first = reader.ReadOrFail("Invalid numeric literal");
-                if (first < '0' || first > '9')
-                {
-                    throw reader.CreateException("Invalid numeric literal");
-                }
-                builder.Append(first);
-                int digitCount;
-                char? next = ConsumeDigits(builder, out digitCount);
-                if (first == '0' && digitCount != 0)
-                {
-                    throw reader.CreateException("Invalid numeric literal: leading 0 for non-zero value.");
-                }
-                return next;
-            }
-
-            private char? ReadFrac(StringBuilder builder)
-            {
-                builder.Append('.'); // Already consumed this
-                int digitCount;
-                char? next = ConsumeDigits(builder, out digitCount);
-                if (digitCount == 0)
-                {
-                    throw reader.CreateException("Invalid numeric literal: fraction with no trailing digits");
-                }
-                return next;
-            }
-
-            private char? ReadExp(StringBuilder builder)
-            {
-                builder.Append('E'); // Already consumed this (or 'e')
-                char? next = reader.Read();
-                if (next == null)
-                {
-                    throw reader.CreateException("Invalid numeric literal: exponent with no trailing digits");
-                }
-                if (next == '-' || next == '+')
-                {
-                    builder.Append(next.Value);
-                }
-                else
-                {
-                    reader.PushBack(next.Value);
-                }
-                int digitCount;
-                next = ConsumeDigits(builder, out digitCount);
-                if (digitCount == 0)
-                {
-                    throw reader.CreateException("Invalid numeric literal: exponent without value");
-                }
-                return next;
-            }
-
-            private char? ConsumeDigits(StringBuilder builder, out int count)
-            {
-                count = 0;
-                while (true)
-                {
-                    char? next = reader.Read();
-                    if (next == null || next.Value < '0' || next.Value > '9')
-                    {
-                        return next;
-                    }
-                    count++;
-                    builder.Append(next.Value);
-                }
-            }
-
-            /// <summary>
-            /// Validates that we're in a valid state to read a value (using the given error prefix if necessary)
-            /// and changes the state to the appropriate one, e.g. ObjectAfterColon to ObjectAfterProperty.
-            /// </summary>
-            private void ValidateAndModifyStateForValue(string errorPrefix)
-            {
-                ValidateState(ValueStates, errorPrefix);
-                switch (state)
-                {
-                    case State.StartOfDocument:
-                        state = State.ExpectedEndOfDocument;
-                        return;
-                    case State.ObjectAfterColon:
-                        state = State.ObjectAfterProperty;
-                        return;
-                    case State.ArrayStart:
-                    case State.ArrayAfterComma:
-                        state = State.ArrayAfterValue;
-                        return;
-                    default:
-                        throw new InvalidOperationException("ValidateAndModifyStateForValue does not handle all value states (and should)");
-                }
-            }
-
-            /// <summary>
-            /// Pops the top-most container, and sets the state to the appropriate one for the end of a value
-            /// in the parent container.
-            /// </summary>
-            private void PopContainer()
-            {
-                containerStack.Pop();
-                var parent = containerStack.Peek();
-                switch (parent)
-                {
-                    case ContainerType.Object:
-                        state = State.ObjectAfterProperty;
-                        break;
-                    case ContainerType.Array:
-                        state = State.ArrayAfterValue;
-                        break;
-                    case ContainerType.Document:
-                        state = State.ExpectedEndOfDocument;
-                        break;
-                    default:
-                        throw new InvalidOperationException("Unexpected container type: " + parent);
-                }
-            }
-
-            private enum ContainerType
-            {
-                Document, Object, Array
-            }
-
-            /// <summary>
-            /// Possible states of the tokenizer.
-            /// </summary>
-            /// <remarks>
-            /// <para>This is a flags enum purely so we can simply and efficiently represent a set of valid states
-            /// for checking.</para>
-            /// <para>
-            /// Each is documented with an example,
-            /// where ^ represents the current position within the text stream. The examples all use string values,
-            /// but could be any value, including nested objects/arrays.
-            /// The complete state of the tokenizer also includes a stack to indicate the contexts (arrays/objects).
-            /// Any additional notional state of "AfterValue" indicates that a value has been completed, at which 
-            /// point there's an immediate transition to ExpectedEndOfDocument,  ObjectAfterProperty or ArrayAfterValue.
-            /// </para>
-            /// <para>
-            /// These states were derived manually by reading RFC 7159 carefully.
-            /// </para>
-            /// </remarks>
-            [Flags]
-            private enum State
-            {
-                /// <summary>
-                /// ^ { "foo": "bar" }
-                /// Before the value in a document. Next states: ObjectStart, ArrayStart, "AfterValue"
-                /// </summary>
-                StartOfDocument = 1 << 0,
-                /// <summary>
-                /// { "foo": "bar" } ^
-                /// After the value in a document. Next states: ReaderExhausted
-                /// </summary>
-                ExpectedEndOfDocument = 1 << 1,
-                /// <summary>
-                /// { "foo": "bar" } ^ (and already read to the end of the reader)
-                /// Terminal state.
-                /// </summary>
-                ReaderExhausted = 1 << 2,
-                /// <summary>
-                /// { ^ "foo": "bar" }
-                /// Before the *first* property in an object.
-                /// Next states:
-                /// "AfterValue" (empty object)
-                /// ObjectBeforeColon (read a name)
-                /// </summary>
-                ObjectStart = 1 << 3,
-                /// <summary>
-                /// { "foo" ^ : "bar", "x": "y" }
-                /// Next state: ObjectAfterColon
-                /// </summary>
-                ObjectBeforeColon = 1 << 4,
-                /// <summary>
-                /// { "foo" : ^ "bar", "x": "y" }
-                /// Before any property other than the first in an object.
-                /// (Equivalently: after any property in an object) 
-                /// Next states:
-                /// "AfterValue" (value is simple)
-                /// ObjectStart (value is object)
-                /// ArrayStart (value is array)
-                /// </summary>
-                ObjectAfterColon = 1 << 5,
-                /// <summary>
-                /// { "foo" : "bar" ^ , "x" : "y" }
-                /// At the end of a property, so expecting either a comma or end-of-object
-                /// Next states: ObjectAfterComma or "AfterValue"
-                /// </summary>
-                ObjectAfterProperty = 1 << 6,
-                /// <summary>
-                /// { "foo":"bar", ^ "x":"y" }
-                /// Read the comma after the previous property, so expecting another property.
-                /// This is like ObjectStart, but closing brace isn't valid here
-                /// Next state: ObjectBeforeColon.
-                /// </summary>
-                ObjectAfterComma = 1 << 7,
-                /// <summary>
-                /// [ ^ "foo", "bar" ]
-                /// Before the *first* value in an array.
-                /// Next states:
-                /// "AfterValue" (read a value)
-                /// "AfterValue" (end of array; will pop stack)
-                /// </summary>
-                ArrayStart = 1 << 8,
-                /// <summary>
-                /// [ "foo" ^ , "bar" ]
-                /// After any value in an array, so expecting either a comma or end-of-array
-                /// Next states: ArrayAfterComma or "AfterValue"
-                /// </summary>
-                ArrayAfterValue = 1 << 9,
-                /// <summary>
-                /// [ "foo", ^ "bar" ]
-                /// After a comma in an array, so there *must* be another value (simple or complex).
-                /// Next states: "AfterValue" (simple value), StartObject, StartArray
-                /// </summary>
-                ArrayAfterComma = 1 << 10
-            }
-
-            /// <summary>
-            /// Wrapper around a text reader allowing small amounts of buffering and location handling.
-            /// </summary>
-            private class PushBackReader
-            {
-                // TODO: Add locations for errors etc.
-
-                private readonly TextReader reader;
-
-                internal PushBackReader(TextReader reader)
-                {
-                    // TODO: Wrap the reader in a BufferedReader?
-                    this.reader = reader;
-                }
-
-                /// <summary>
-                /// The buffered next character, if we have one.
-                /// </summary>
-                private char? nextChar;
-
-                /// <summary>
-                /// Returns the next character in the stream, or null if we have reached the end.
-                /// </summary>
-                /// <returns></returns>
-                internal char? Read()
-                {
-                    if (nextChar != null)
-                    {
-                        char? tmp = nextChar;
-                        nextChar = null;
-                        return tmp;
-                    }
-                    int next = reader.Read();
-                    return next == -1 ? null : (char?) next;
-                }
-
-                internal char ReadOrFail(string messageOnFailure)
-                {
-                    char? next = Read();
-                    if (next == null)
-                    {
-                        throw CreateException(messageOnFailure);
-                    }
-                    return next.Value;
-                }
-
-                internal void PushBack(char c)
-                {
-                    if (nextChar != null)
-                    {
-                        throw new InvalidOperationException("Cannot push back when already buffering a character");
-                    }
-                    nextChar = c;
-                }
-
-                /// <summary>
-                /// Creates a new exception appropriate for the current state of the reader.
-                /// </summary>
-                internal InvalidJsonException CreateException(string message)
-                {
-                    // TODO: Keep track of and use the location.
-                    return new InvalidJsonException(message);
-                }
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf/LimitedInputStream.cs

@@ -1,110 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Stream implementation which proxies another stream, only allowing a certain amount
-    /// of data to be read. Note that this is only used to read delimited streams, so it
-    /// doesn't attempt to implement everything.
-    /// </summary>
-    internal sealed class LimitedInputStream : Stream
-    {
-        private readonly Stream proxied;
-        private int bytesLeft;
-
-        internal LimitedInputStream(Stream proxied, int size)
-        {
-            this.proxied = proxied;
-            bytesLeft = size;
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override void Flush()
-        {
-        }
-
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        public override long Position
-        {
-            get { throw new NotSupportedException(); }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (bytesLeft > 0)
-            {
-                int bytesRead = proxied.Read(buffer, offset, Math.Min(bytesLeft, count));
-                bytesLeft -= bytesRead;
-                return bytesRead;
-            }
-            return 0;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}

csharp/src/Google.Protobuf/MessageExtensions.cs

@@ -1,157 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Extension methods on <see cref="IMessage"/> and <see cref="IMessage{T}"/>.
-    /// </summary>
-    public static class MessageExtensions
-    {
-        /// <summary>
-        /// Merges data from the given byte array into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeFrom(this IMessage message, byte[] data)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(data, "data");
-            CodedInputStream input = new CodedInputStream(data);
-            message.MergeFrom(input);
-            input.CheckReadEndOfStreamTag();
-        }
-
-        /// <summary>
-        /// Merges data from the given byte string into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeFrom(this IMessage message, ByteString data)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(data, "data");
-            CodedInputStream input = data.CreateCodedInput();
-            message.MergeFrom(input);
-            input.CheckReadEndOfStreamTag();
-        }
-
-        /// <summary>
-        /// Merges data from the given stream into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeFrom(this IMessage message, Stream input)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(input, "input");
-            CodedInputStream codedInput = new CodedInputStream(input);
-            message.MergeFrom(codedInput);
-            codedInput.CheckReadEndOfStreamTag();
-        }
-
-        /// <summary>
-        /// Merges length-delimited data from the given stream into an existing message.
-        /// </summary>
-        /// <remarks>
-        /// The stream is expected to contain a length and then the data. Only the amount of data
-        /// specified by the length will be consumed.
-        /// </remarks>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeDelimitedFrom(this IMessage message, Stream input)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(input, "input");
-            int size = (int) CodedInputStream.ReadRawVarint32(input);
-            Stream limitedStream = new LimitedInputStream(input, size);
-            message.MergeFrom(limitedStream);
-        }
-
-        /// <summary>
-        /// Converts the given message into a byte array in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to convert.</param>
-        /// <returns>The message data as a byte array.</returns>
-        public static byte[] ToByteArray(this IMessage message)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            byte[] result = new byte[message.CalculateSize()];
-            CodedOutputStream output = new CodedOutputStream(result);
-            message.WriteTo(output);
-            output.CheckNoSpaceLeft();
-            return result;
-        }
-
-        /// <summary>
-        /// Writes the given message data to the given stream in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to write to the stream.</param>
-        /// <param name="output">The stream to write to.</param>
-        public static void WriteTo(this IMessage message, Stream output)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(output, "output");
-            CodedOutputStream codedOutput = new CodedOutputStream(output);
-            message.WriteTo(codedOutput);
-            codedOutput.Flush();
-        }
-
-        /// <summary>
-        /// Writes the length and then data of the given message to a stream.
-        /// </summary>
-        /// <param name="message">The message to write.</param>
-        /// <param name="output">The output stream to write to.</param>
-        public static void WriteDelimitedTo(this IMessage message, Stream output)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(output, "output");
-            CodedOutputStream codedOutput = new CodedOutputStream(output);
-            codedOutput.WriteRawVarint32((uint)message.CalculateSize());
-            message.WriteTo(codedOutput);
-            codedOutput.Flush();
-        }
-
-        /// <summary>
-        /// Converts the given message into a byte string in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to convert.</param>
-        /// <returns>The message data as a byte string.</returns>
-        public static ByteString ToByteString(this IMessage message)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            return ByteString.AttachBytes(message.ToByteArray());
-        }        
-    }
-}

csharp/src/Google.Protobuf/MessageParser.cs

@@ -1,267 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// A general message parser, typically used by reflection-based code as all the methods
-    /// return simple <see cref="IMessage"/>.
-    /// </summary>
-    public class MessageParser
-    {
-        private Func<IMessage> factory;
-
-        internal MessageParser(Func<IMessage> factory)
-        {
-            this.factory = factory;
-        }
-
-        /// <summary>
-        /// Creates a template instance ready for population.
-        /// </summary>
-        /// <returns>An empty message.</returns>
-        internal IMessage CreateTemplate()
-        {
-            return factory();
-        }
-
-        /// <summary>
-        /// Parses a message from a byte array.
-        /// </summary>
-        /// <param name="data">The byte array containing the message. Must not be null.</param>
-        /// <returns>The newly parsed message.</returns>
-        public IMessage ParseFrom(byte[] data)
-        {
-            ProtoPreconditions.CheckNotNull(data, "data");
-            IMessage message = factory();
-            message.MergeFrom(data);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given byte string.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseFrom(ByteString data)
-        {
-            ProtoPreconditions.CheckNotNull(data, "data");
-            IMessage message = factory();
-            message.MergeFrom(data);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseFrom(Stream input)
-        {
-            IMessage message = factory();
-            message.MergeFrom(input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a length-delimited message from the given stream.
-        /// </summary>
-        /// <remarks>
-        /// The stream is expected to contain a length and then the data. Only the amount of data
-        /// specified by the length will be consumed.
-        /// </remarks>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseDelimitedFrom(Stream input)
-        {
-            IMessage message = factory();
-            message.MergeDelimitedFrom(input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given coded input stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseFrom(CodedInputStream input)
-        {
-            IMessage message = factory();
-            message.MergeFrom(input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given JSON.
-        /// </summary>
-        /// <param name="json">The JSON to parse.</param>
-        /// <returns>The parsed message.</returns>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public IMessage ParseJson(string json)
-        {
-            IMessage message = factory();
-            JsonParser.Default.Merge(message, json);
-            return message;
-        }
-    }
-
-    /// <summary>
-    /// A parser for a specific message type.
-    /// </summary>
-    /// <remarks>
-    /// <p>
-    /// This delegates most behavior to the
-    /// <see cref="IMessage.MergeFrom"/> implementation within the original type, but
-    /// provides convenient overloads to parse from a variety of sources.
-    /// </p>
-    /// <p>
-    /// Most applications will never need to create their own instances of this type;
-    /// instead, use the static <c>Parser</c> property of a generated message type to obtain a
-    /// parser for that type.
-    /// </p>
-    /// </remarks>
-    /// <typeparam name="T">The type of message to be parsed.</typeparam>
-    public sealed class MessageParser<T> : MessageParser where T : IMessage<T>
-    {
-        // Implementation note: all the methods here *could* just delegate up to the base class and cast the result.
-        // The current implementation avoids a virtual method call and a cast, which *may* be significant in some cases.
-        // Benchmarking work is required to measure the significance - but it's only a few lines of code in any case.
-        // The API wouldn't change anyway - just the implementation - so this work can be deferred.
-        private readonly Func<T> factory; 
-
-        /// <summary>
-        /// Creates a new parser.
-        /// </summary>
-        /// <remarks>
-        /// The factory method is effectively an optimization over using a generic constraint
-        /// to require a parameterless constructor: delegates are significantly faster to execute.
-        /// </remarks>
-        /// <param name="factory">Function to invoke when a new, empty message is required.</param>
-        public MessageParser(Func<T> factory) : base(() => factory())
-        {
-            this.factory = factory;
-        }
-
-        /// <summary>
-        /// Creates a template instance ready for population.
-        /// </summary>
-        /// <returns>An empty message.</returns>
-        internal new T CreateTemplate()
-        {
-            return factory();
-        }
-
-        /// <summary>
-        /// Parses a message from a byte array.
-        /// </summary>
-        /// <param name="data">The byte array containing the message. Must not be null.</param>
-        /// <returns>The newly parsed message.</returns>
-        public new T ParseFrom(byte[] data)
-        {
-            ProtoPreconditions.CheckNotNull(data, "data");
-            T message = factory();
-            message.MergeFrom(data);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given byte string.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseFrom(ByteString data)
-        {
-            ProtoPreconditions.CheckNotNull(data, "data");
-            T message = factory();
-            message.MergeFrom(data);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseFrom(Stream input)
-        {
-            T message = factory();
-            message.MergeFrom(input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a length-delimited message from the given stream.
-        /// </summary>
-        /// <remarks>
-        /// The stream is expected to contain a length and then the data. Only the amount of data
-        /// specified by the length will be consumed.
-        /// </remarks>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseDelimitedFrom(Stream input)
-        {
-            T message = factory();
-            message.MergeDelimitedFrom(input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given coded input stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseFrom(CodedInputStream input)
-        {
-            T message = factory();
-            message.MergeFrom(input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given JSON.
-        /// </summary>
-        /// <param name="json">The JSON to parse.</param>
-        /// <returns>The parsed message.</returns>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public new T ParseJson(string json)
-        {
-            T message = factory();
-            JsonParser.Default.Merge(message, json);
-            return message;
-        }
-    }
-}

csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs

@@ -1,49 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Runtime.CompilerServices;
-using System.Security;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-#if !NCRUNCH
-[assembly: AllowPartiallyTrustedCallers]
-#endif
-
-[assembly: InternalsVisibleTo("Google.Protobuf.Test, PublicKey=" +
-    "002400000480000094000000060200000024000052534131000400000100010025800fbcfc63a1" +
-    "7c66b303aae80b03a6beaa176bb6bef883be436f2a1579edd80ce23edf151a1f4ced97af83abcd" +
-    "981207041fd5b2da3b498346fcfcd94910d52f25537c4a43ce3fbe17dc7d43e6cbdb4d8f1242dc" +
-    "b6bd9b5906be74da8daa7d7280f97130f318a16c07baf118839b156299a48522f9fae2371c9665" +
-    "c5ae9cb6")]

csharp/src/Google.Protobuf/ProtoPreconditions.cs

@@ -1,79 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods for throwing exceptions when preconditions are not met.
-    /// </summary>
-    /// <remarks>
-    /// This class is used internally and by generated code; it is not particularly
-    /// expected to be used from application code, although nothing prevents it
-    /// from being used that way.
-    /// </remarks>
-    public static class ProtoPreconditions
-    {
-        /// <summary>
-        /// Throws an ArgumentNullException if the given value is null, otherwise
-        /// return the value to the caller.
-        /// </summary>
-        public static T CheckNotNull<T>(T value, string name) where T : class
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(name);
-            }
-            return value;
-        }
-
-        /// <summary>
-        /// Throws an ArgumentNullException if the given value is null, otherwise
-        /// return the value to the caller.
-        /// </summary>
-        /// <remarks>
-        /// This is equivalent to <see cref="CheckNotNull{T}(T, string)"/> but without the type parameter
-        /// constraint. In most cases, the constraint is useful to prevent you from calling CheckNotNull
-        /// with a value type - but it gets in the way if either you want to use it with a nullable
-        /// value type, or you want to use it with an unconstrained type parameter.
-        /// </remarks>
-        internal static T CheckNotNullUnconstrained<T>(T value, string name)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(name);
-            }
-            return value;
-        }
-    }
-}

csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs

@@ -1,85 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Base class for nearly all descriptors, providing common functionality.
-    /// </summary>
-    public abstract class DescriptorBase : IDescriptor
-    {
-        private readonly FileDescriptor file;
-        private readonly string fullName;
-        private readonly int index;
-
-        internal DescriptorBase(FileDescriptor file, string fullName, int index)
-        {
-            this.file = file;
-            this.fullName = fullName;
-            this.index = index;
-        }
-
-        /// <value>
-        /// The index of this descriptor within its parent descriptor. 
-        /// </value>
-        /// <remarks>
-        /// This returns the index of this descriptor within its parent, for
-        /// this descriptor's type. (There can be duplicate values for different
-        /// types, e.g. one enum type with index 0 and one message type with index 0.)
-        /// </remarks>
-        public int Index
-        {
-            get { return index; }
-        }
-
-        /// <summary>
-        /// Returns the name of the entity (field, message etc) being described.
-        /// </summary>
-        public abstract string Name { get; }
-
-        /// <summary>
-        /// The fully qualified name of the descriptor's target.
-        /// </summary>
-        public string FullName
-        {
-            get { return fullName; }
-        }
-
-        /// <value>
-        /// The file this descriptor was declared in.
-        /// </value>
-        public FileDescriptor File
-        {
-            get { return file; }
-        }
-    }
-}

csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs

@@ -1,368 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Contains lookup tables containing all the descriptors defined in a particular file.
-    /// </summary>
-    internal sealed class DescriptorPool
-    {
-        private readonly IDictionary<string, IDescriptor> descriptorsByName =
-            new Dictionary<string, IDescriptor>();
-
-        private readonly IDictionary<DescriptorIntPair, FieldDescriptor> fieldsByNumber =
-            new Dictionary<DescriptorIntPair, FieldDescriptor>();
-
-        private readonly IDictionary<DescriptorIntPair, EnumValueDescriptor> enumValuesByNumber =
-            new Dictionary<DescriptorIntPair, EnumValueDescriptor>();
-
-        private readonly HashSet<FileDescriptor> dependencies;
-
-        internal DescriptorPool(FileDescriptor[] dependencyFiles)
-        {
-            dependencies = new HashSet<FileDescriptor>();
-            for (int i = 0; i < dependencyFiles.Length; i++)
-            {
-                dependencies.Add(dependencyFiles[i]);
-                ImportPublicDependencies(dependencyFiles[i]);
-            }
-
-            foreach (FileDescriptor dependency in dependencyFiles)
-            {
-                AddPackage(dependency.Package, dependency);
-            }
-        }
-
-        private void ImportPublicDependencies(FileDescriptor file)
-        {
-            foreach (FileDescriptor dependency in file.PublicDependencies)
-            {
-                if (dependencies.Add(dependency))
-                {
-                    ImportPublicDependencies(dependency);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Finds a symbol of the given name within the pool.
-        /// </summary>
-        /// <typeparam name="T">The type of symbol to look for</typeparam>
-        /// <param name="fullName">Fully-qualified name to look up</param>
-        /// <returns>The symbol with the given name and type,
-        /// or null if the symbol doesn't exist or has the wrong type</returns>
-        internal T FindSymbol<T>(string fullName) where T : class
-        {
-            IDescriptor result;
-            descriptorsByName.TryGetValue(fullName, out result);
-            T descriptor = result as T;
-            if (descriptor != null)
-            {
-                return descriptor;
-            }
-
-            // dependencies contains direct dependencies and any *public* dependencies
-            // of those dependencies (transitively)... so we don't need to recurse here.
-            foreach (FileDescriptor dependency in dependencies)
-            {
-                dependency.DescriptorPool.descriptorsByName.TryGetValue(fullName, out result);
-                descriptor = result as T;
-                if (descriptor != null)
-                {
-                    return descriptor;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Adds a package to the symbol tables. If a package by the same name
-        /// already exists, that is fine, but if some other kind of symbol
-        /// exists under the same name, an exception is thrown. If the package
-        /// has multiple components, this also adds the parent package(s).
-        /// </summary>
-        internal void AddPackage(string fullName, FileDescriptor file)
-        {
-            int dotpos = fullName.LastIndexOf('.');
-            String name;
-            if (dotpos != -1)
-            {
-                AddPackage(fullName.Substring(0, dotpos), file);
-                name = fullName.Substring(dotpos + 1);
-            }
-            else
-            {
-                name = fullName;
-            }
-
-            IDescriptor old;
-            if (descriptorsByName.TryGetValue(fullName, out old))
-            {
-                if (!(old is PackageDescriptor))
-                {
-                    throw new DescriptorValidationException(file,
-                                                            "\"" + name +
-                                                            "\" is already defined (as something other than a " +
-                                                            "package) in file \"" + old.File.Name + "\".");
-                }
-            }
-            descriptorsByName[fullName] = new PackageDescriptor(name, fullName, file);
-        }
-
-        /// <summary>
-        /// Adds a symbol to the symbol table.
-        /// </summary>
-        /// <exception cref="DescriptorValidationException">The symbol already existed
-        /// in the symbol table.</exception>
-        internal void AddSymbol(IDescriptor descriptor)
-        {
-            ValidateSymbolName(descriptor);
-            String fullName = descriptor.FullName;
-
-            IDescriptor old;
-            if (descriptorsByName.TryGetValue(fullName, out old))
-            {
-                int dotPos = fullName.LastIndexOf('.');
-                string message;
-                if (descriptor.File == old.File)
-                {
-                    if (dotPos == -1)
-                    {
-                        message = "\"" + fullName + "\" is already defined.";
-                    }
-                    else
-                    {
-                        message = "\"" + fullName.Substring(dotPos + 1) + "\" is already defined in \"" +
-                                  fullName.Substring(0, dotPos) + "\".";
-                    }
-                }
-                else
-                {
-                    message = "\"" + fullName + "\" is already defined in file \"" + old.File.Name + "\".";
-                }
-                throw new DescriptorValidationException(descriptor, message);
-            }
-            descriptorsByName[fullName] = descriptor;
-        }
-
-        private static readonly Regex ValidationRegex = new Regex("^[_A-Za-z][_A-Za-z0-9]*$",
-                                                                  FrameworkPortability.CompiledRegexWhereAvailable);
-
-        /// <summary>
-        /// Verifies that the descriptor's name is valid (i.e. it contains
-        /// only letters, digits and underscores, and does not start with a digit).
-        /// </summary>
-        /// <param name="descriptor"></param>
-        private static void ValidateSymbolName(IDescriptor descriptor)
-        {
-            if (descriptor.Name == "")
-            {
-                throw new DescriptorValidationException(descriptor, "Missing name.");
-            }
-            if (!ValidationRegex.IsMatch(descriptor.Name))
-            {
-                throw new DescriptorValidationException(descriptor,
-                                                        "\"" + descriptor.Name + "\" is not a valid identifier.");
-            }
-        }
-
-        /// <summary>
-        /// Returns the field with the given number in the given descriptor,
-        /// or null if it can't be found.
-        /// </summary>
-        internal FieldDescriptor FindFieldByNumber(MessageDescriptor messageDescriptor, int number)
-        {
-            FieldDescriptor ret;
-            fieldsByNumber.TryGetValue(new DescriptorIntPair(messageDescriptor, number), out ret);
-            return ret;
-        }
-
-        internal EnumValueDescriptor FindEnumValueByNumber(EnumDescriptor enumDescriptor, int number)
-        {
-            EnumValueDescriptor ret;
-            enumValuesByNumber.TryGetValue(new DescriptorIntPair(enumDescriptor, number), out ret);
-            return ret;
-        }
-
-        /// <summary>
-        /// Adds a field to the fieldsByNumber table.
-        /// </summary>
-        /// <exception cref="DescriptorValidationException">A field with the same
-        /// containing type and number already exists.</exception>
-        internal void AddFieldByNumber(FieldDescriptor field)
-        {
-            DescriptorIntPair key = new DescriptorIntPair(field.ContainingType, field.FieldNumber);
-            FieldDescriptor old;
-            if (fieldsByNumber.TryGetValue(key, out old))
-            {
-                throw new DescriptorValidationException(field, "Field number " + field.FieldNumber +
-                                                               "has already been used in \"" +
-                                                               field.ContainingType.FullName +
-                                                               "\" by field \"" + old.Name + "\".");
-            }
-            fieldsByNumber[key] = field;
-        }
-
-        /// <summary>
-        /// Adds an enum value to the enumValuesByNumber table. If an enum value
-        /// with the same type and number already exists, this method does nothing.
-        /// (This is allowed; the first value defined with the number takes precedence.)
-        /// </summary>
-        internal void AddEnumValueByNumber(EnumValueDescriptor enumValue)
-        {
-            DescriptorIntPair key = new DescriptorIntPair(enumValue.EnumDescriptor, enumValue.Number);
-            if (!enumValuesByNumber.ContainsKey(key))
-            {
-                enumValuesByNumber[key] = enumValue;
-            }
-        }
-
-        /// <summary>
-        /// Looks up a descriptor by name, relative to some other descriptor.
-        /// The name may be fully-qualified (with a leading '.'), partially-qualified,
-        /// or unqualified. C++-like name lookup semantics are used to search for the
-        /// matching descriptor.
-        /// </summary>
-        /// <remarks>
-        /// This isn't heavily optimized, but it's only used during cross linking anyway.
-        /// If it starts being used more widely, we should look at performance more carefully.
-        /// </remarks>
-        internal IDescriptor LookupSymbol(string name, IDescriptor relativeTo)
-        {
-            IDescriptor result;
-            if (name.StartsWith("."))
-            {
-                // Fully-qualified name.
-                result = FindSymbol<IDescriptor>(name.Substring(1));
-            }
-            else
-            {
-                // If "name" is a compound identifier, we want to search for the
-                // first component of it, then search within it for the rest.
-                int firstPartLength = name.IndexOf('.');
-                string firstPart = firstPartLength == -1 ? name : name.Substring(0, firstPartLength);
-
-                // We will search each parent scope of "relativeTo" looking for the
-                // symbol.
-                StringBuilder scopeToTry = new StringBuilder(relativeTo.FullName);
-
-                while (true)
-                {
-                    // Chop off the last component of the scope.
-
-                    int dotpos = scopeToTry.ToString().LastIndexOf(".");
-                    if (dotpos == -1)
-                    {
-                        result = FindSymbol<IDescriptor>(name);
-                        break;
-                    }
-                    else
-                    {
-                        scopeToTry.Length = dotpos + 1;
-
-                        // Append firstPart and try to find.
-                        scopeToTry.Append(firstPart);
-                        result = FindSymbol<IDescriptor>(scopeToTry.ToString());
-
-                        if (result != null)
-                        {
-                            if (firstPartLength != -1)
-                            {
-                                // We only found the first part of the symbol.  Now look for
-                                // the whole thing.  If this fails, we *don't* want to keep
-                                // searching parent scopes.
-                                scopeToTry.Length = dotpos + 1;
-                                scopeToTry.Append(name);
-                                result = FindSymbol<IDescriptor>(scopeToTry.ToString());
-                            }
-                            break;
-                        }
-
-                        // Not found.  Remove the name so we can try again.
-                        scopeToTry.Length = dotpos;
-                    }
-                }
-            }
-
-            if (result == null)
-            {
-                throw new DescriptorValidationException(relativeTo, "\"" + name + "\" is not defined.");
-            }
-            else
-            {
-                return result;
-            }
-        }
-
-        /// <summary>
-        /// Struct used to hold the keys for the fieldByNumber table.
-        /// </summary>
-        private struct DescriptorIntPair : IEquatable<DescriptorIntPair>
-        {
-            private readonly int number;
-            private readonly IDescriptor descriptor;
-
-            internal DescriptorIntPair(IDescriptor descriptor, int number)
-            {
-                this.number = number;
-                this.descriptor = descriptor;
-            }
-
-            public bool Equals(DescriptorIntPair other)
-            {
-                return descriptor == other.descriptor
-                       && number == other.number;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj is DescriptorIntPair)
-                {
-                    return Equals((DescriptorIntPair) obj);
-                }
-                return false;
-            }
-
-            public override int GetHashCode()
-            {
-                return descriptor.GetHashCode()*((1 << 16) - 1) + number;
-            }
-        }
-    }
-}

csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs

@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Internal class containing utility methods when working with descriptors.
-    /// </summary>
-    internal static class DescriptorUtil
-    {
-        /// <summary>
-        /// Equivalent to Func[TInput, int, TOutput] but usable in .NET 2.0. Only used to convert
-        /// arrays.
-        /// </summary>
-        internal delegate TOutput IndexedConverter<TInput, TOutput>(TInput element, int index);
-
-        /// <summary>
-        /// Converts the given array into a read-only list, applying the specified conversion to
-        /// each input element.
-        /// </summary>
-        internal static IList<TOutput> ConvertAndMakeReadOnly<TInput, TOutput>
-            (IList<TInput> input, IndexedConverter<TInput, TOutput> converter)
-        {
-            TOutput[] array = new TOutput[input.Count];
-            for (int i = 0; i < array.Length; i++)
-            {
-                array[i] = converter(input[i], i);
-            }
-            return new ReadOnlyCollection<TOutput>(array);
-        }
-    }
-}