Updated csharp_EXTRA_DIST for Travis
diff --git a/Makefile.am b/Makefile.am
index c669424..c0b9644 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@
   csharp/build_packages.bat                                                  \
   csharp/buildall.sh                                                         \
   csharp/generate_protos.sh                                                  \
-  csharp/keys/Google.ProtocolBuffers.snk                                     \
+  csharp/keys/Google.Protobuf.snk                                            \
   csharp/keys/generate_new_key.bat                                           \
   csharp/protos/extest/unittest_issues.proto                                 \
   csharp/src/AddressBook/AddPerson.cs                                        \
@@ -57,94 +57,95 @@
   csharp/src/AddressBook/Properties/AssemblyInfo.cs                          \
   csharp/src/AddressBook/SampleUsage.cs                                      \
   csharp/src/AddressBook/app.config                                          \
-  csharp/src/ProtoDump/Program.cs                                            \
-  csharp/src/ProtoDump/Properties/AssemblyInfo.cs                            \
-  csharp/src/ProtoDump/ProtoDump.csproj                                      \
-  csharp/src/ProtoDump/app.config                                            \
-  csharp/src/ProtocolBuffers.Test/ByteStringTest.cs                          \
-  csharp/src/ProtocolBuffers.Test/CodedInputStreamExtensions.cs              \
-  csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs                    \
-  csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs                   \
-  csharp/src/ProtocolBuffers.Test/Collections/MapFieldTest.cs                \
-  csharp/src/ProtocolBuffers.Test/Collections/RepeatedFieldTest.cs           \
-  csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs                    \
-  csharp/src/ProtocolBuffers.Test/EqualityTester.cs                          \
-  csharp/src/ProtocolBuffers.Test/FieldCodecTest.cs                          \
-  csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs                    \
-  csharp/src/ProtocolBuffers.Test/IssuesTest.cs                              \
-  csharp/src/ProtocolBuffers.Test/JsonFormatterTest.cs                       \
-  csharp/src/ProtocolBuffers.Test/Properties/AppManifest.xml                 \
-  csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs                 \
-  csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml        \
-  csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj                \
-  csharp/src/ProtocolBuffers.Test/Reflection/DescriptorsTest.cs              \
-  csharp/src/ProtocolBuffers.Test/SampleEnum.cs                              \
-  csharp/src/ProtocolBuffers.Test/SampleMessages.cs                          \
-  csharp/src/ProtocolBuffers.Test/TestCornerCases.cs                         \
-  csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs            \
-  csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs         \
-  csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs   \
-  csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs               \
-  csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs               \
-  csharp/src/ProtocolBuffers.Test/packages.config                            \
-  csharp/src/ProtocolBuffers.sln                                             \
-  csharp/src/ProtocolBuffers/ByteArray.cs                                    \
-  csharp/src/ProtocolBuffers/ByteString.cs                                   \
-  csharp/src/ProtocolBuffers/CodedInputStream.cs                             \
-  csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs                \
-  csharp/src/ProtocolBuffers/CodedOutputStream.cs                            \
-  csharp/src/ProtocolBuffers/Collections/MapField.cs                         \
-  csharp/src/ProtocolBuffers/Collections/ReadOnlyDictionary.cs               \
-  csharp/src/ProtocolBuffers/Collections/RepeatedField.cs                    \
-  csharp/src/ProtocolBuffers/FieldCodec.cs                                   \
-  csharp/src/ProtocolBuffers/FrameworkPortability.cs                         \
-  csharp/src/ProtocolBuffers/Freezable.cs                                    \
-  csharp/src/ProtocolBuffers/Google.Protobuf.nuspec                          \
-  csharp/src/ProtocolBuffers/IMessage.cs                                     \
-  csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs               \
-  csharp/src/ProtocolBuffers/JsonFormatter.cs                                \
-  csharp/src/ProtocolBuffers/LimitedInputStream.cs                           \
-  csharp/src/ProtocolBuffers/MessageExtensions.cs                            \
-  csharp/src/ProtocolBuffers/MessageParser.cs                                \
-  csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs                      \
-  csharp/src/ProtocolBuffers/ProtocolBuffers.csproj                          \
-  csharp/src/ProtocolBuffers/Reflection/DescriptorBase.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/DescriptorPool.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/DescriptorProtoFile.cs               \
-  csharp/src/ProtocolBuffers/Reflection/DescriptorUtil.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/DescriptorValidationException.cs     \
-  csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs               \
-  csharp/src/ProtocolBuffers/Reflection/FieldAccessorBase.cs                 \
-  csharp/src/ProtocolBuffers/Reflection/FieldAccessorTable.cs                \
-  csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs                   \
-  csharp/src/ProtocolBuffers/Reflection/FieldType.cs                         \
-  csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/IDescriptor.cs                       \
-  csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/MapFieldAccessor.cs                  \
-  csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs                 \
-  csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs                  \
-  csharp/src/ProtocolBuffers/Reflection/OneofAccessor.cs                     \
-  csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs                   \
-  csharp/src/ProtocolBuffers/Reflection/PackageDescriptor.cs                 \
-  csharp/src/ProtocolBuffers/Reflection/PartialClasses.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/ReflectionUtil.cs                    \
-  csharp/src/ProtocolBuffers/Reflection/RepeatedFieldAccessor.cs             \
-  csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs                 \
-  csharp/src/ProtocolBuffers/Reflection/SingleFieldAccessor.cs               \
-  csharp/src/ProtocolBuffers/ThrowHelper.cs                                  \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Any.cs                           \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Api.cs                           \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Duration.cs                      \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Empty.cs                         \
-  csharp/src/ProtocolBuffers/WellKnownTypes/FieldMask.cs                     \
-  csharp/src/ProtocolBuffers/WellKnownTypes/SourceContext.cs                 \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs                        \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Timestamp.cs                     \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Type.cs                          \
-  csharp/src/ProtocolBuffers/WellKnownTypes/Wrappers.cs                      \
-  csharp/src/ProtocolBuffers/WireFormat.cs                                   \
+  csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj        \
+  csharp/src/Google.Protobuf.JsonDump/Program.cs                             \
+  csharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs             \
+  csharp/src/Google.Protobuf.JsonDump/app.config                             \
+  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/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.csproj                \
+  csharp/src/Google.Protobuf.Test/IssuesTest.cs                              \
+  csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs                       \
+  csharp/src/Google.Protobuf.Test/Properties/AppManifest.xml                 \
+  csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs                 \
+  csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.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/WrappersTest.cs             \
+  csharp/src/Google.Protobuf.Test/packages.config                            \
+  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/FieldCodec.cs                                   \
+  csharp/src/Google.Protobuf/FrameworkPortability.cs                         \
+  csharp/src/Google.Protobuf/Freezable.cs                                    \
+  csharp/src/Google.Protobuf/Google.Protobuf.csproj                          \
+  csharp/src/Google.Protobuf/Google.Protobuf.nuspec                          \
+  csharp/src/Google.Protobuf/IMessage.cs                                     \
+  csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs               \
+  csharp/src/Google.Protobuf/JsonFormatter.cs                                \
+  csharp/src/Google.Protobuf/LimitedInputStream.cs                           \
+  csharp/src/Google.Protobuf/MessageExtensions.cs                            \
+  csharp/src/Google.Protobuf/MessageParser.cs                                \
+  csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs                      \
+  csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs                    \
+  csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs                    \
+  csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.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/FieldAccessorTable.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/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/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/ThrowHelper.cs                                  \
+  csharp/src/Google.Protobuf/WellKnownTypes/Any.cs                           \
+  csharp/src/Google.Protobuf/WellKnownTypes/Api.cs                           \
+  csharp/src/Google.Protobuf/WellKnownTypes/Duration.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/Timestamp.cs                     \
+  csharp/src/Google.Protobuf/WellKnownTypes/Type.cs                          \
+  csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs                      \
+  csharp/src/Google.Protobuf/WireFormat.cs                                   \
   csharp/src/packages/repositories.config
 
 java_EXTRA_DIST=                                                             \