First pass at the big rename from ProtocolBuffers to Google.Protobuf.
We'll see what I've missed when CI fails...
diff --git a/appveyor.bat b/appveyor.bat
index c50616f..356a13f 100644
--- a/appveyor.bat
+++ b/appveyor.bat
@@ -20,8 +20,8 @@
echo Building C#
cd csharp\src
nuget restore
-msbuild ProtocolBuffers.sln /p:Platform="Any CPU" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error
-nunit-console ProtocolBuffers.Test\bin\%configuration%\Google.Protobuf.Test.dll || goto error
+msbuild Google.Protobuf.sln /p:Platform="Any CPU" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error
+nunit-console Google.Protobuf.Test\bin\%configuration%\Google.Protobuf.Test.dll || goto error
goto :EOF
:error
diff --git a/csharp/.gitignore b/csharp/.gitignore
index 91baa54..dbb3dd3 100644
--- a/csharp/.gitignore
+++ b/csharp/.gitignore
@@ -3,12 +3,12 @@
#
src/AddressBook/bin
src/AddressBook/obj
-src/ProtocolBuffers/bin/
-src/ProtocolBuffers/obj/
-src/ProtocolBuffers.Test/bin/
-src/ProtocolBuffers.Test/obj/
-src/ProtoDump/bin/
-src/ProtoDump/obj/
+src/Google.Protobuf/bin/
+src/Google.Protobuf/obj/
+src/Google.Protobuf.Test/bin/
+src/Google.Protobuf.Test/obj/
+src/Google.Protobuf.JsonDump/bin/
+src/Google.Protobuf.JsonDump/obj/
mono/bin
mono/tmp
mono/protoc
diff --git a/csharp/README.md b/csharp/README.md
index 72f5552..82e9f43 100644
--- a/csharp/README.md
+++ b/csharp/README.md
@@ -18,14 +18,14 @@
Usage
=====
-The easiest way to use C# protocol buffers in your project is to use the [Google.ProtocolBuffers NuGet package](http://www.nuget.org/packages/Google.ProtocolBuffers/). This package is the legacy package for C# protocol buffers, but it will work fine with C# code generated by `protoc` if you use proto2 syntax (The API of the runtime library haven't changed so far).
-
-We will definitely release a new NuGet package for the runtime library in the future. The new runtime library WILL contain significant semantic, backwardly-incompatible changes in proto handling (mostly because we will be adding proto3 support and we will be using that oportunity to make some design changes). So keep in mind that you will need to regenerate your proto files and switch to a new NuGet package once the new version of runtime library becomes available.
+Use `protoc` with the `--csharp_out` option to generate C# files in the specified directory.
+Include these in your C# project, and add a reference to the `Google.Protobuf` project. Currently
+there is no NuGet package for this, but we will be building one as soon as the API is stable.
Building
========
-Open the `src/ProtocolBuffers.sln` solution in Visual Studio. Click "Build solution" to build the solution. You should be able to run the NUnit test from Test Explorer (you might need to install NUnit Visual Studio add-in).
+Open the `src/Google.Protobuf.sln` solution in Visual Studio. Click "Build solution" to build the solution. You should be able to run the NUnit test from Test Explorer (you might need to install NUnit Visual Studio add-in).
Supported Visual Studio versions are VS2013 (update 4) and VS2015. On Linux, you can also use Monodevelop 5.9 (older versions might work fine).
diff --git a/csharp/build_packages.bat b/csharp/build_packages.bat
index 315c150..1502f06 100644
--- a/csharp/build_packages.bat
+++ b/csharp/build_packages.bat
@@ -3,8 +3,8 @@
@rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe
-@rem Build src/ProtocolBuffers.sln solution in Release configuration first.
-%NUGET% pack src\ProtocolBuffers\Google.Protobuf.nuspec -Symbols || goto :error
+@rem Build src/Google.Protobuf.sln solution in Release configuration first.
+%NUGET% pack src\Google.Protobuf\Google.Protobuf.nuspec -Symbols || goto :error
goto :EOF
diff --git a/csharp/buildall.sh b/csharp/buildall.sh
index 6b56afe..20fb46b 100755
--- a/csharp/buildall.sh
+++ b/csharp/buildall.sh
@@ -6,13 +6,13 @@
# The rest you can leave intact
CONFIG=Release
-KEYFILE=../keys/Google.ProtocolBuffers.snk # TODO(jtattermusch): signing!
+KEYFILE=../keys/Google.Google.Protobuf.snk # TODO(jtattermusch): signing!
SRC=$(dirname $0)/src
set -ex
echo Building the solution.
-xbuild /p:Configuration=$CONFIG $SRC/ProtocolBuffers.sln
+xbuild /p:Configuration=$CONFIG $SRC/Google.Protobuf.sln
echo Running tests.
-$NUNIT_CONSOLE $SRC/ProtocolBuffers.Test/bin/$CONFIG/Google.Protobuf.Test.dll
+$NUNIT_CONSOLE $SRC/Google.Protobuf.Test/bin/$CONFIG/Google.Protobuf.Test.dll
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh
index 7978166..b4343a6 100755
--- a/csharp/generate_protos.sh
+++ b/csharp/generate_protos.sh
@@ -38,11 +38,11 @@
# Descriptor proto
# TODO(jonskeet): Remove fixup
cp src/google/protobuf/descriptor.proto src/google/protobuf/descriptor_proto_file.proto
-$PROTOC -Isrc --csharp_out=csharp/src/ProtocolBuffers/Reflection \
+$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf/Reflection \
src/google/protobuf/descriptor_proto_file.proto
rm src/google/protobuf/descriptor_proto_file.proto
-$PROTOC -Isrc --csharp_out=csharp/src/ProtocolBuffers/WellKnownTypes \
+$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf/WellKnownTypes \
src/google/protobuf/any.proto \
src/google/protobuf/api.proto \
src/google/protobuf/duration.proto \
@@ -54,7 +54,7 @@
src/google/protobuf/type.proto \
src/google/protobuf/wrappers.proto
-$PROTOC -Isrc --csharp_out=csharp/src/ProtocolBuffers.Test/TestProtos \
+$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf.Test/TestProtos \
src/google/protobuf/map_unittest_proto3.proto \
src/google/protobuf/unittest_proto3.proto \
src/google/protobuf/unittest_import_proto3.proto \
@@ -62,7 +62,7 @@
src/google/protobuf/unittest_well_known_types.proto
-$PROTOC -Icsharp/protos/extest --csharp_out=csharp/src/ProtocolBuffers.Test/TestProtos \
+$PROTOC -Icsharp/protos/extest --csharp_out=csharp/src/Google.Protobuf.Test/TestProtos \
csharp/protos/extest/unittest_issues.proto
# AddressBook sample protos
diff --git a/csharp/keys/Google.ProtocolBuffers.snk b/csharp/keys/Google.Protobuf.snk
similarity index 100%
rename from csharp/keys/Google.ProtocolBuffers.snk
rename to csharp/keys/Google.Protobuf.snk
Binary files differ
diff --git a/csharp/keys/generate_new_key.bat b/csharp/keys/generate_new_key.bat
index 9f99c07..6af599a 100644
--- a/csharp/keys/generate_new_key.bat
+++ b/csharp/keys/generate_new_key.bat
@@ -3,11 +3,11 @@
goto USEPATH
:FOUND
-"C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\sn.exe" -k %~dp0\Google.ProtocolBuffers.snk
+"C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin\sn.exe" -k %~dp0\Google.Protobuf.snk
GOTO EXIT
:USEPATH
-sn.exe -k %~dp0\Google.ProtocolBuffers.snk
+sn.exe -k %~dp0\Google.Protobuf.snk
GOTO EXIT
:EXIT
\ No newline at end of file
diff --git a/csharp/src/AddressBook/AddressBook.csproj b/csharp/src/AddressBook/AddressBook.csproj
index b338af9..bae43b4 100644
--- a/csharp/src/AddressBook/AddressBook.csproj
+++ b/csharp/src/AddressBook/AddressBook.csproj
@@ -53,9 +53,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers.csproj">
+ <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj">
<Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
- <Name>ProtocolBuffers</Name>
+ <Name>Google.Protobuf</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/csharp/src/ProtoDump/ProtoDump.csproj b/csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
similarity index 89%
rename from csharp/src/ProtoDump/ProtoDump.csproj
rename to csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
index a74067e..c3c9d27 100644
--- a/csharp/src/ProtoDump/ProtoDump.csproj
+++ b/csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
@@ -10,8 +10,8 @@
<ProjectGuid>{D7282E99-2DC3-405B-946F-177DB2FD2AE2}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Google.Protobuf.ProtoDump</RootNamespace>
- <AssemblyName>ProtoDump</AssemblyName>
+ <RootNamespace>Google.Protobuf.JsonDump</RootNamespace>
+ <AssemblyName>Google.Protobuf.JsonDump</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
@@ -48,9 +48,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers.csproj">
+ <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj">
<Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
- <Name>ProtocolBuffers</Name>
+ <Name>Google.Protobuf</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/csharp/src/ProtoDump/Program.cs b/csharp/src/Google.Protobuf.JsonDump/Program.cs
similarity index 93%
rename from csharp/src/ProtoDump/Program.cs
rename to csharp/src/Google.Protobuf.JsonDump/Program.cs
index 6d42076..99e60e9 100644
--- a/csharp/src/ProtoDump/Program.cs
+++ b/csharp/src/Google.Protobuf.JsonDump/Program.cs
@@ -36,7 +36,7 @@
namespace Google.Protobuf.ProtoDump
{
/// <summary>
- /// Small utility to load a binary message and dump it in text form
+ /// Small utility to load a binary message and dump it in JSON format.
/// </summary>
internal class Program
{
@@ -44,7 +44,7 @@
{
if (args.Length != 2)
{
- Console.Error.WriteLine("Usage: ProtoDump <descriptor type name> <input data>");
+ 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;
diff --git a/csharp/src/ProtoDump/Properties/AssemblyInfo.cs b/csharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs
similarity index 100%
rename from csharp/src/ProtoDump/Properties/AssemblyInfo.cs
rename to csharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs
diff --git a/csharp/src/ProtoDump/app.config b/csharp/src/Google.Protobuf.JsonDump/app.config
similarity index 100%
rename from csharp/src/ProtoDump/app.config
rename to csharp/src/Google.Protobuf.JsonDump/app.config
diff --git a/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs b/csharp/src/Google.Protobuf.Test/ByteStringTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/ByteStringTest.cs
rename to csharp/src/Google.Protobuf.Test/ByteStringTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/CodedInputStreamExtensions.cs b/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/CodedInputStreamExtensions.cs
rename to csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
diff --git a/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs b/csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs
rename to csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs b/csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs
rename to csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/Collections/MapFieldTest.cs b/csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/Collections/MapFieldTest.cs
rename to csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/Collections/RepeatedFieldTest.cs b/csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/Collections/RepeatedFieldTest.cs
rename to csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs b/csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs
rename to csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/EqualityTester.cs b/csharp/src/Google.Protobuf.Test/EqualityTester.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/EqualityTester.cs
rename to csharp/src/Google.Protobuf.Test/EqualityTester.cs
diff --git a/csharp/src/ProtocolBuffers.Test/FieldCodecTest.cs b/csharp/src/Google.Protobuf.Test/FieldCodecTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/FieldCodecTest.cs
rename to csharp/src/Google.Protobuf.Test/FieldCodecTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
rename to csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
similarity index 95%
rename from csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
rename to csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
index a425ad8..6d8b4de 100644
--- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
+++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>..\..\keys\Google.ProtocolBuffers.snk</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
@@ -97,9 +97,9 @@
<Compile Include="WellKnownTypes\WrappersTest.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers.csproj">
+ <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj">
<Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
- <Name>ProtocolBuffers</Name>
+ <Name>Google.Protobuf</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/csharp/src/ProtocolBuffers.Test/IssuesTest.cs b/csharp/src/Google.Protobuf.Test/IssuesTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/IssuesTest.cs
rename to csharp/src/Google.Protobuf.Test/IssuesTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/JsonFormatterTest.cs b/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/JsonFormatterTest.cs
rename to csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AppManifest.xml b/csharp/src/Google.Protobuf.Test/Properties/AppManifest.xml
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/Properties/AppManifest.xml
rename to csharp/src/Google.Protobuf.Test/Properties/AppManifest.xml
diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs b/csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
similarity index 89%
rename from csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
rename to csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
index bfa1f05..b551388 100644
--- a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
+++ b/csharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("ProtocolBuffers.Test")]
+[assembly: AssemblyTitle("Google.Protobuf.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ProtocolBuffers.Test")]
+[assembly: AssemblyProduct("Google.Protobuf.Test")]
[assembly: AssemblyCopyright("Copyright � 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/csharp/src/ProtocolBuffers.Test/Reflection/DescriptorsTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/Reflection/DescriptorsTest.cs
rename to csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/SampleEnum.cs b/csharp/src/Google.Protobuf.Test/SampleEnum.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/SampleEnum.cs
rename to csharp/src/Google.Protobuf.Test/SampleEnum.cs
diff --git a/csharp/src/ProtocolBuffers.Test/SampleMessages.cs b/csharp/src/Google.Protobuf.Test/SampleMessages.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/SampleMessages.cs
rename to csharp/src/Google.Protobuf.Test/SampleMessages.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs b/csharp/src/Google.Protobuf.Test/TestCornerCases.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestCornerCases.cs
rename to csharp/src/Google.Protobuf.Test/TestCornerCases.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
rename to csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs
rename to csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
rename to csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs
rename to csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs
rename to csharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestWellKnownTypes.cs b/csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/TestProtos/UnittestWellKnownTypes.cs
rename to csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs
diff --git a/csharp/src/ProtocolBuffers.Test/WellKnownTypes/WrappersTest.cs b/csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/WellKnownTypes/WrappersTest.cs
rename to csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
diff --git a/csharp/src/ProtocolBuffers.Test/packages.config b/csharp/src/Google.Protobuf.Test/packages.config
similarity index 100%
rename from csharp/src/ProtocolBuffers.Test/packages.config
rename to csharp/src/Google.Protobuf.Test/packages.config
diff --git a/csharp/src/ProtocolBuffers.sln b/csharp/src/Google.Protobuf.sln
similarity index 82%
rename from csharp/src/ProtocolBuffers.sln
rename to csharp/src/Google.Protobuf.sln
index c5708fd..a290ae8 100644
--- a/csharp/src/ProtocolBuffers.sln
+++ b/csharp/src/Google.Protobuf.sln
@@ -2,13 +2,13 @@
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolBuffers", "ProtocolBuffers\ProtocolBuffers.csproj", "{6908BDCE-D925-43F3-94AC-A531E6DF2591}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf", "Google.Protobuf\Google.Protobuf.csproj", "{6908BDCE-D925-43F3-94AC-A531E6DF2591}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolBuffers.Test", "ProtocolBuffers.Test\ProtocolBuffers.Test.csproj", "{DD01ED24-3750-4567-9A23-1DB676A15610}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf.Test", "Google.Protobuf.Test\Google.Protobuf.Test.csproj", "{DD01ED24-3750-4567-9A23-1DB676A15610}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddressBook", "AddressBook\AddressBook.csproj", "{A31F5FB2-4FF3-432A-B35B-5CD203606311}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoDump", "ProtoDump\ProtoDump.csproj", "{D7282E99-2DC3-405B-946F-177DB2FD2AE2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf.JsonDump", "Google.Protobuf.JsonDump\Google.Protobuf.JsonDump.csproj", "{D7282E99-2DC3-405B-946F-177DB2FD2AE2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/csharp/src/ProtocolBuffers/ByteArray.cs b/csharp/src/Google.Protobuf/ByteArray.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/ByteArray.cs
rename to csharp/src/Google.Protobuf/ByteArray.cs
diff --git a/csharp/src/ProtocolBuffers/ByteString.cs b/csharp/src/Google.Protobuf/ByteString.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/ByteString.cs
rename to csharp/src/Google.Protobuf/ByteString.cs
diff --git a/csharp/src/ProtocolBuffers/CodedInputStream.cs b/csharp/src/Google.Protobuf/CodedInputStream.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/CodedInputStream.cs
rename to csharp/src/Google.Protobuf/CodedInputStream.cs
diff --git a/csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs b/csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/CodedOutputStream.ComputeSize.cs
rename to csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
diff --git a/csharp/src/ProtocolBuffers/CodedOutputStream.cs b/csharp/src/Google.Protobuf/CodedOutputStream.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/CodedOutputStream.cs
rename to csharp/src/Google.Protobuf/CodedOutputStream.cs
diff --git a/csharp/src/ProtocolBuffers/Collections/MapField.cs b/csharp/src/Google.Protobuf/Collections/MapField.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Collections/MapField.cs
rename to csharp/src/Google.Protobuf/Collections/MapField.cs
diff --git a/csharp/src/ProtocolBuffers/Collections/ReadOnlyDictionary.cs b/csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Collections/ReadOnlyDictionary.cs
rename to csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
diff --git a/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs b/csharp/src/Google.Protobuf/Collections/RepeatedField.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
rename to csharp/src/Google.Protobuf/Collections/RepeatedField.cs
diff --git a/csharp/src/ProtocolBuffers/FieldCodec.cs b/csharp/src/Google.Protobuf/FieldCodec.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/FieldCodec.cs
rename to csharp/src/Google.Protobuf/FieldCodec.cs
diff --git a/csharp/src/ProtocolBuffers/FrameworkPortability.cs b/csharp/src/Google.Protobuf/FrameworkPortability.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/FrameworkPortability.cs
rename to csharp/src/Google.Protobuf/FrameworkPortability.cs
diff --git a/csharp/src/ProtocolBuffers/Freezable.cs b/csharp/src/Google.Protobuf/Freezable.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Freezable.cs
rename to csharp/src/Google.Protobuf/Freezable.cs
diff --git a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
similarity index 97%
rename from csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
rename to csharp/src/Google.Protobuf/Google.Protobuf.csproj
index 402d661..431668f 100644
--- a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -15,7 +15,7 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>..\..\keys\Google.ProtocolBuffers.snk</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
<OldToolsVersion>3.5</OldToolsVersion>
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
</PropertyGroup>
diff --git a/csharp/src/ProtocolBuffers/Google.Protobuf.nuspec b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec
similarity index 100%
rename from csharp/src/ProtocolBuffers/Google.Protobuf.nuspec
rename to csharp/src/Google.Protobuf/Google.Protobuf.nuspec
diff --git a/csharp/src/ProtocolBuffers/IMessage.cs b/csharp/src/Google.Protobuf/IMessage.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/IMessage.cs
rename to csharp/src/Google.Protobuf/IMessage.cs
diff --git a/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs b/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
rename to csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
diff --git a/csharp/src/ProtocolBuffers/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/JsonFormatter.cs
rename to csharp/src/Google.Protobuf/JsonFormatter.cs
diff --git a/csharp/src/ProtocolBuffers/LimitedInputStream.cs b/csharp/src/Google.Protobuf/LimitedInputStream.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/LimitedInputStream.cs
rename to csharp/src/Google.Protobuf/LimitedInputStream.cs
diff --git a/csharp/src/ProtocolBuffers/MessageExtensions.cs b/csharp/src/Google.Protobuf/MessageExtensions.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/MessageExtensions.cs
rename to csharp/src/Google.Protobuf/MessageExtensions.cs
diff --git a/csharp/src/ProtocolBuffers/MessageParser.cs b/csharp/src/Google.Protobuf/MessageParser.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/MessageParser.cs
rename to csharp/src/Google.Protobuf/MessageParser.cs
diff --git a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
similarity index 96%
rename from csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
rename to csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
index c6918e7..a957e8b 100644
--- a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
+++ b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
@@ -37,11 +37,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("ProtocolBuffers")]
+[assembly: AssemblyTitle("Google.Protobuf")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ProtocolBuffers")]
+[assembly: AssemblyProduct("Google.Protobuf")]
[assembly: AssemblyCopyright("Copyright © 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/csharp/src/ProtocolBuffers/Reflection/DescriptorBase.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/DescriptorBase.cs
rename to csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/DescriptorPool.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/DescriptorPool.cs
rename to csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/DescriptorProtoFile.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/DescriptorProtoFile.cs
rename to csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/DescriptorUtil.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/DescriptorUtil.cs
rename to csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/DescriptorValidationException.cs b/csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/DescriptorValidationException.cs
rename to csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/EnumDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/EnumValueDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/FieldAccessorBase.cs b/csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/FieldAccessorBase.cs
rename to csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/FieldAccessorTable.cs b/csharp/src/Google.Protobuf/Reflection/FieldAccessorTable.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/FieldAccessorTable.cs
rename to csharp/src/Google.Protobuf/Reflection/FieldAccessorTable.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/FieldDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/FieldType.cs b/csharp/src/Google.Protobuf/Reflection/FieldType.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/FieldType.cs
rename to csharp/src/Google.Protobuf/Reflection/FieldType.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/FileDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/IDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/IDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/IDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/IDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs b/csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
rename to csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/MapFieldAccessor.cs b/csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/MapFieldAccessor.cs
rename to csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/MessageDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/MethodDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/OneofAccessor.cs b/csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/OneofAccessor.cs
rename to csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/OneofDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/PackageDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/PackageDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/PartialClasses.cs b/csharp/src/Google.Protobuf/Reflection/PartialClasses.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/PartialClasses.cs
rename to csharp/src/Google.Protobuf/Reflection/PartialClasses.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/ReflectionUtil.cs b/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/ReflectionUtil.cs
rename to csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/RepeatedFieldAccessor.cs b/csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/RepeatedFieldAccessor.cs
rename to csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs b/csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/ServiceDescriptor.cs
rename to csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
diff --git a/csharp/src/ProtocolBuffers/Reflection/SingleFieldAccessor.cs b/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/Reflection/SingleFieldAccessor.cs
rename to csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
diff --git a/csharp/src/ProtocolBuffers/ThrowHelper.cs b/csharp/src/Google.Protobuf/ThrowHelper.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/ThrowHelper.cs
rename to csharp/src/Google.Protobuf/ThrowHelper.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Any.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Api.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Api.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Duration.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Duration.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Empty.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Empty.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/FieldMask.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/SourceContext.cs b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/SourceContext.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Timestamp.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Type.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Type.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Wrappers.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WellKnownTypes/Wrappers.cs
rename to csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
diff --git a/csharp/src/ProtocolBuffers/WireFormat.cs b/csharp/src/Google.Protobuf/WireFormat.cs
similarity index 100%
rename from csharp/src/ProtocolBuffers/WireFormat.cs
rename to csharp/src/Google.Protobuf/WireFormat.cs
diff --git a/csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml b/csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml
deleted file mode 100644
index 634f44b..0000000
--- a/csharp/src/ProtocolBuffers.Test/Properties/OutOfBrowserSettings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<OutOfBrowserSettings ShortName="ProtocolBuffers.Test" EnableGPUAcceleration="False" ShowInstallMenuItem="False">
- <OutOfBrowserSettings.Blurb>ProtocolBuffers.Test</OutOfBrowserSettings.Blurb>
- <OutOfBrowserSettings.WindowSettings>
- <WindowSettings Title="ProtocolBuffers.Test" />
- </OutOfBrowserSettings.WindowSettings>
- <OutOfBrowserSettings.Icons />
-</OutOfBrowserSettings>
\ No newline at end of file
diff --git a/csharp/src/packages/repositories.config b/csharp/src/packages/repositories.config
index 0117aa7..7037941 100644
--- a/csharp/src/packages/repositories.config
+++ b/csharp/src/packages/repositories.config
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
- <repository path="..\ProtocolBuffers.Test\packages.config" />
- <repository path="..\ProtocolBuffersLite.Test\packages.config" />
+ <repository path="..\Google.Protobuf.Test\packages.config" />
</repositories>
\ No newline at end of file
