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

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

benchmarks/google_size.proto

@@ -4,7 +4,6 @@ package benchmarks;
 
 option java_outer_classname = "GoogleSize";
 option optimize_for = CODE_SIZE;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message SizeMessage1 {
   required string field1 = 1;

benchmarks/google_speed.proto

@@ -4,7 +4,6 @@ package benchmarks;
 
 option java_outer_classname = "GoogleSpeed";
 option optimize_for = SPEED;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message SpeedMessage1 {
   required string field1 = 1;

csharp/build/BuildAll.bat

@@ -1,8 +0,0 @@
-@echo off
-SET BUILD_TARGET=%~1
-SET BUILD_CONFIG=%~2
-
-IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
-IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
-
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /t:%BUILD_TARGET% /toolsversion:4.0 "/p:Configuration=%BUILD_CONFIG%" %3 %4 %5 %6

csharp/build/Common.targets

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-<!-- **********************************************************************************************
-Targets For Clean
-*********************************************************************************************** -->
-
-  <Target Name="_CleanFolder">
-    <Message Importance="normal" Text="Removing temporary directory '$(CleanFolderDirectory)'"/>
-    <Error Text="Can not remove empty directory name." Condition=" '$(CleanFolderDirectory)' == '' " />
-
-    <Exec WorkingDirectory="$(MSBuildProjectDirectory)" Condition="Exists($(CleanFolderDirectory))" Outputs="@(Ignore)"
-      Command="MOVE /Y &quot;$(CleanFolderDirectory)&quot; &quot;$(CleanFolderDirectory)-deleted&quot; > NUL" />
-    
-    <RemoveDir Directories="$(CleanFolderDirectory)-deleted" Condition="Exists('$(CleanFolderDirectory)-deleted')" />
-  </Target>
-
-  <Target Name="_CleanTempOutput">
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="CleanFolderDirectory=%(TempBuildFolder.Identity);" Targets="_CleanFolder" />
-  </Target>
-  
-  <Target Name="_CleanAll" DependsOnTargets="_CleanTempOutput">
-    <MakeDir Directories="$(BuildTempDirectory)" />
-    <MakeDir Directories="$(BuildOutputDirectory)" />
-  </Target>
-
-<!-- **********************************************************************************************
-Targets For Build
-*********************************************************************************************** -->
-
-  <Target Name="_CompileAll">
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="SolutionTarget=Rebuild;" Targets="_BuildAllConfigurations" />
-  </Target>
-
-  <Target Name="_BuildAllConfigurations">
-    <MSBuild Properties="TargetVersion=cf20;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=cf35;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=net20;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=net35;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=net40;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=sl20;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=sl30;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=sl40;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="TargetVersion=pl40;Configuration=$(Configuration);Platform=$(Platform);" Targets="$(SolutionTarget)" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-  </Target>
-
-<!-- **********************************************************************************************
-Targets For Tools
-*********************************************************************************************** -->
-
-  <Target Name="_BuildTools">
-    
-    <MSBuild Targets="Build" ToolsVersion="3.5" Projects="$(ProjectDirectory)\src\ProtocolBuffers.sln" Properties="Configuration=Release;Platform=Any CPU;" />
-    <Copy SourceFiles="%(ToolsOutputItem.Identity)" DestinationFolder="$(BuildOutputDirectory)\tools" />
-
-    <Copy SourceFiles="$(LibDirectory)\NUnit-config\nunit-console.v2.0.config" DestinationFiles="$(NUnitExePath).config" />
-    <Exec 
-      WorkingDirectory="%(ToolsTestContainer.RootDir)%(ToolsTestContainer.Directory)"
-      Command="&quot;$(NUnitExePath)&quot; /nologo /noshadow &quot;%(ToolsTestContainer.Identity)&quot; /xml:&quot;$(BuildTempDirectory)\%(ToolsTestContainer.Filename).xml&quot;" />
-    
-  </Target>
-
-<!-- **********************************************************************************************
-Targets For GenerateSource
-*********************************************************************************************** -->
-
-  <Target Name="_GenerateProjects">
-    <Exec Command="&quot;$(CsProjectProjector)&quot; csproj_templates src\ProtocolBuffersLibrary.sln" WorkingDirectory="$(ProjectDirectory)" />
-  </Target>
-  
-  <Target Name="_CleanTempSource">
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="CleanFolderDirectory=$(SourceTempDirectory);" Targets="_CleanFolder" />
-    <MakeDir Directories="$(SourceTempDirectory)" />
-  </Target>
-  
-  <Target Name="_GenerateSource" DependsOnTargets="_CleanTempSource">
-    <Message Importance="high" Text="Generating source from proto files" />
-    <Exec Command="&quot;$(ProtocExePath)&quot; --proto_path=$(ProtosDirectory) --descriptor_set_out=compiled.pb @(Protos->'%(RelativeDir)%(Filename)%(Extension)', ' ')" WorkingDirectory="$(SourceTempDirectory)" />
-    <Exec Command="&quot;$(ProtogenExePath)&quot; compiled.pb" WorkingDirectory="$(SourceTempDirectory)" />
-  </Target>
-
-  <Target Name="_CopyGeneratedSource" DependsOnTargets="_GenerateSource">
-    <Copy SourceFiles="%(GeneratedSource.Identity)" DestinationFiles="%(GeneratedSource.TargetDirectory)\%(GeneratedSource.Filename)%(GeneratedSource.Extension)" />
-  </Target>
-
-<!-- **********************************************************************************************
-Targets For Package
-*********************************************************************************************** -->
-
-  <Target Name="_PackageAll">
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="SolutionTarget=_Publish;" Targets="_BuildAllConfigurations" />
-  </Target>
-
-  <Target Name="_GeneratePackage">
-    <Copy SourceFiles="@(StaticPackageItem)" DestinationFolder="$(BuildOutputPackage)\%(StaticPackageItem.TargetDirectory)\%(StaticPackageItem.RecursiveDir)" />
-    <Exec Command="&quot;$(ZipExePath)&quot; a -tzip $(BuildTempDirectory)\$(PackageName)-binaries.zip * -x!*.pdb -r" WorkingDirectory="$(BuildOutputPackage)" />
-    <Exec Command="&quot;$(ZipExePath)&quot; a -tzip $(BuildTempDirectory)\$(PackageName)-symbols.zip * -r" WorkingDirectory="$(BuildOutputPackage)" />
-  </Target>
-
-<!-- **********************************************************************************************
-Targets For Benchmark
-*********************************************************************************************** -->
-
-  <Target Name="_RunBenchmarks">
-    <ItemGroup>
-      <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SizeMessage1,ProtoBench" />
-      <BenchmarkParameter Include="google_message1.dat" />
-      <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SpeedMessage1,ProtoBench" />
-      <BenchmarkParameter Include="google_message1.dat" />
-      <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SizeMessage2,ProtoBench" />
-      <BenchmarkParameter Include="google_message2.dat" />
-      <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SpeedMessage2,ProtoBench" />
-      <BenchmarkParameter Include="google_message2.dat" />
-    </ItemGroup>
-
-    <Message Text="Running ProtoBench.exe" />
-    <Exec Command="ProtoBench.exe $(BenchmarkArgs) @(BenchmarkParameter->'%(Identity)', ' ') &quot;/log:$(BenchmarkOutputFile)&quot;"
-          WorkingDirectory="$(SourceDirectory)\ProtoBench\bin\NET35\Release" />
-
-  </Target>
-
-</Project>

csharp/build/Google.ProtocolBuffers.nuspec

@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="nuspec.xsd">
-  <metadata>
-    <id>Google.ProtocolBuffers</id>
-    <version>$version$</version>
-    <owners>Jon Skeet</owners>
-    <authors>Jon Skeet</authors>
-    <licenseUrl>http://code.google.com/p/protobuf-csharp-port/source/browse/license.txt</licenseUrl>
-    <projectUrl>http://code.google.com/p/protobuf-csharp-port/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>Copyright 2008 Google Inc.  All rights reserved.</copyright>
-    <tags>Protocol Buffers Binary Serialization Format Google</tags>
-
-    <title>Google.ProtocolBuffers</title>
-    <summary>A managed code generator and library for Google's data interchange format.</summary>
-    <description><![CDATA[
-Protocol Buffers is a binary serialization format and technology, released to the open source community by Google in 2008.  
-Its primary use is to produce small fast binary representations of a 'message' or object for serialization or transportation.
-There are various implementations of Protocol Buffers in .NET. This project is a fairly close port of the Google Java implementation.
-
-There are two main parts:
-
-tools/protoc.exe, which takes the textual representation of the protocol buffer and turns it into a binary representation for use with ProtoGen.exe.
-tools/ProtoGen.exe, which takes binary representations of protocol buffer descriptors (as generated by the "stock" protoc binary supplied by Google) and creates C# source code. This is only required at build time.
-
-lib/*/Google.ProtocolBuffers.dll, which is a supporting library. This is required at execution time.
-lib/*/Google.ProtocolBuffers.Serialization.dll, a supplementary library that provides extensions for reading and writing protocol buffers to xml, json, and others.
-
-LINKS:
-
-Project Home    - http://code.google.com/p/protobuf-csharp-port
-Online Help     - http://help.protobuffers.net
-Developer Guide - http://code.google.com/apis/protocolbuffers/docs/overview.html
-Language Guide  - http://code.google.com/apis/protocolbuffers/docs/proto.html
-
-    ]]></description>
-	
-    <references>
-      <reference file="Google.ProtocolBuffers.dll"/>
-      <reference file="Google.ProtocolBuffers.Serialization.dll"/>
-    </references>
-  
-  </metadata>
-  <files>
-    <!-- Release Binaries -->
-    <file src="..\build_output\Release\**\Google.ProtocolBuffers.???" target="lib\" />
-    <file src="..\build_output\Release\**\Google.ProtocolBuffers.Serialization.???" target="lib\" />
-    <!-- Tools -->
-    <file src="..\build_output\tools\**\*" target="tools\" />
-    <file src="..\build_output\protos\**\*" target="tools\" />
-    <!-- Content -->
-    <file src="..\build_output\CHANGES.txt" target="tools\"/>
-    <file src="..\build_output\license.txt" target="tools\"/>
-    <file src="..\build_output\tools\protoc-license.txt" target="tools\"/>
-    <!-- Source -->
-    <file src="..\src\ProtocolBuffers\**\*.cs" target="src\ProtocolBuffers\"/>
-    <file src="..\src\ProtocolBuffers.Serialization\**\*.cs" target="src\ProtocolBuffers.Serialization\"/>
-  </files>
-</package>

csharp/build/Google.ProtocolBuffersLite.nuspec

@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="nuspec.xsd">
-  <metadata>
-    <id>Google.ProtocolBuffersLite</id>
-    <version>$version$</version>
-    <owners>Jon Skeet</owners>
-    <authors>Jon Skeet</authors>
-    <licenseUrl>http://code.google.com/p/protobuf-csharp-port/source/browse/license.txt</licenseUrl>
-    <projectUrl>http://code.google.com/p/protobuf-csharp-port/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>Copyright 2008 Google Inc.  All rights reserved.</copyright>
-    <tags>Protocol Buffers Binary Serialization Format Google</tags>
-
-    <title>Google.ProtocolBuffersLite</title>
-    <summary>A managed code generator and library for Google's data interchange format.</summary>
-    <description><![CDATA[
-Protocol Buffers is a binary serialization format and technology, released to the open source community by Google in 2008.  
-Its primary use is to produce small fast binary representations of a 'message' or object for serialization or transportation.
-There are various implementations of Protocol Buffers in .NET. This project is a fairly close port of the Google Java implementation.
-
-There are two main parts:
-
-tools/protoc.exe, which takes the textual representation of the protocol buffer and turns it into a binary representation for use with ProtoGen.exe.
-tools/ProtoGen.exe, which takes binary representations of protocol buffer descriptors (as generated by the "stock" protoc binary supplied by Google) and creates C# source code. This is only required at build time.
-
-lib/*/Google.ProtocolBuffersLite.dll, which is a supporting library. This is required at execution time.
-lib/*/Google.ProtocolBuffersLite.Serialization.dll, a supplementary library that provides extensions for reading and writing protocol buffers to xml, json, and others.
-
-LINKS:
-
-Project Home    - http://code.google.com/p/protobuf-csharp-port
-Online Help     - http://help.protobuffers.net
-Developer Guide - http://code.google.com/apis/protocolbuffers/docs/overview.html
-Language Guide  - http://code.google.com/apis/protocolbuffers/docs/proto.html
-
-    ]]></description>
-	
-    <references>
-      <reference file="Google.ProtocolBuffersLite.dll"/>
-      <reference file="Google.ProtocolBuffersLite.Serialization.dll"/>
-    </references>
-  
-  </metadata>
-
-  <files>
-    <!-- Release Binaries -->
-    <file src="..\build_output\Release\**\Google.ProtocolBuffersLite.???" target="lib\" />
-    <file src="..\build_output\Release\**\Google.ProtocolBuffersLite.Serialization.???" target="lib\" />
-    <!-- Tools -->
-    <file src="..\build_output\tools\**\*" target="tools\" />
-    <file src="..\build_output\protos\**\*" target="tools\" />
-    <!-- Content -->
-    <file src="..\build_output\CHANGES.txt" target="tools\"/>
-    <file src="..\build_output\license.txt" target="tools\"/>
-    <file src="..\build_output\tools\protoc-license.txt" target="tools\"/>
-    <!-- Source -->
-    <file src="..\src\ProtocolBuffers\**\*.cs" target="src\ProtocolBuffers\"/>
-    <file src="..\src\ProtocolBuffers.Serialization\**\*.cs" target="src\ProtocolBuffers.Serialization\"/>
-  </files>
-</package>

csharp/build/RunBenchmarks.bat

@@ -1,2 +0,0 @@
-@echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4

csharp/build/build.bat

@@ -1,20 +0,0 @@
-@echo off
-SET BUILD_VERSION=%~1
-SET BUILD_TARGET=%~2
-SET BUILD_CONFIG=%~3
-
-IF NOT "%BUILD_VERSION%"=="" GOTO RUN
-ECHO.
-ECHO Usage: build.bat platform [target] [config] [msbuild arguments]
-ECHO.
-ECHO - platform:  CF20, CF35, NET20, NET35, NET40, PL40, SL20, SL30, or SL40
-ECHO - [target]:  Rebuild, Clean, Build, Test, or Publish
-ECHO - [config]:  Debug or Release
-ECHO.
-EXIT /B 1
-
-:RUN
-IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
-IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
-
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo target.csproj /toolsversion:4.0 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:Configuration=%BUILD_CONFIG%;TargetVersion=%BUILD_VERSION%"

csharp/build/build.csproj

@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- build targets -->
-  <Target Name="Clean" DependsOnTargets="_CleanAll" />
-  <Target Name="BuildTools" DependsOnTargets="_BuildTools" />
-  <Target Name="GenerateProjects" DependsOnTargets="_GenerateProjects" />
-  <Target Name="GenerateSource" DependsOnTargets="_GenerateSource;_CopyGeneratedSource" />
-  <Target Name="RebuildSource" DependsOnTargets="Clean;BuildTools;GenerateSource" />
-  <Target Name="Build" DependsOnTargets="GenerateProjects;BuildTools;GenerateSource;_CompileAll" />
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="GeneratePackage" DependsOnTargets="_PackageAll;_GeneratePackage" />
-  <Target Name="FullBuild" DependsOnTargets="Rebuild;GeneratePackage" />
-  <!-- misc targets -->
-  <Target Name="RunBenchmarks" DependsOnTargets="_CleanAll;_BuildTools;_RunBenchmarks" />
-
-  <PropertyGroup>
-    <ProjectName>Protocol Buffers</ProjectName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
-    
-    <!--Directory Paths-->
-    <ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory>
-    <SourceDirectory>$(ProjectDirectory)\src</SourceDirectory>
-    <LibDirectory>$(ProjectDirectory)\lib</LibDirectory>
-    <ProtosDirectory>$(ProjectDirectory)\protos</ProtosDirectory>
-
-    <SourceTempDirectory>$(ProjectDirectory)\build_temp\GeneratedSource</SourceTempDirectory>
-    <BuildTempDirectory>$(ProjectDirectory)\build_temp</BuildTempDirectory>
-    <BuildOutputDirectory>$(ProjectDirectory)\build_output</BuildOutputDirectory>
-    <BuildOutputPackage>$(BuildOutputDirectory)</BuildOutputPackage>
-
-    <BenchmarkArgs>/v2 /fast /formats</BenchmarkArgs>
-    <BenchmarkOutputFile>$(BuildTempDirectory)\..\BenchmarkResults.txt</BenchmarkOutputFile>
-    <BenchmarkProtosDirectory>$(ProjectDirectory)\benchmarks</BenchmarkProtosDirectory>
-
-    <PackageName Condition=" '$(PackageName)' == '' ">$(Configuration)</PackageName>
-    
-    <!--Tool Paths-->
-    <ProtocExePath>$(BuildOutputDirectory)\tools\protoc.exe</ProtocExePath>
-    <ProtogenExePath>$(BuildOutputDirectory)\tools\protogen.exe</ProtogenExePath>
-    <NUnitExePath>$(LibDirectory)\NUnit\tools\nunit-console.exe</NUnitExePath>
-    <CsProjectProjector>$(LibDirectory)\CsProjectProjector\CsProjectProjector.exe</CsProjectProjector>
-    <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath>
-  
-</PropertyGroup>
-
-  <Import Project="Common.targets"/>
-
-  <!-- Proto Files -->
-  <ItemGroup>
-    <Protos Include="$(ProtosDirectory)\extest\unittest_issues.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_extras.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_extras_full.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_extras_lite.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_extras_xmltest.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_generic_services.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_rpc_interop.proto" />
-    <Protos Include="$(ProtosDirectory)\extest\unittest_rpc_interop_lite.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\descriptor.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\csharp_options.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_csharp_options.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_custom_options.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_embed_optimize_for.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_empty.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import_lite.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_lite.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_lite_imports_nonlite.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_mset.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_no_generic_services.proto" />
-    <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_optimize_for.proto" />
-    <Protos Include="$(ProtosDirectory)\google\test\google_size.proto" />
-    <Protos Include="$(ProtosDirectory)\google\test\google_speed.proto" />
-    <Protos Include="$(ProtosDirectory)\tutorial\addressbook.proto" />
-    <!-- for benchmark -->
-    <Protos Include="$(ProtosDirectory)\benchmarks\google_size.proto" />
-    <Protos Include="$(ProtosDirectory)\benchmarks\google_speed.proto" />
-  </ItemGroup>
-  <!-- Generated Source -->
-  <ItemGroup>
-    <!-- Main protos -->
-    <GeneratedSource Include="$(SourceTempDirectory)\CSharpOptions.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\DescriptorProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory>
-    </GeneratedSource>
-        
-    <!-- Address book sample -->
-    <GeneratedSource Include="$(SourceTempDirectory)\AddressBookProtos.cs">
-      <TargetDirectory>$(SourceDirectory)\AddressBook</TargetDirectory>
-    </GeneratedSource>
-    <!-- Unit test -->
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestExtrasProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestExtrasIssuesProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestXmlSerializerTestProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestCSharpOptionsProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestCustomOptionsProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestEmbedOptimizeForProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestEmptyProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestImportLiteProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>  
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestImportProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestMessageSetProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestNoGenericServicesProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestOptimizeForProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestRpcInterop.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestRpcInteropLite.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestGenericServices.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <!-- Lite unit test -->
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestExtrasFullProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestExtrasLiteProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestImportLiteProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestImportProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestLiteImportNonLiteProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestLiteProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestGoogleSizeProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestGoogleSpeedProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\GoogleSizeProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtoBench\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\GoogleSpeedProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtoBench\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestImportProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtoBench\TestProtos</TargetDirectory>
-    </GeneratedSource>
-    <GeneratedSource Include="$(SourceTempDirectory)\UnitTestProtoFile.cs">
-      <TargetDirectory>$(SourceDirectory)\ProtoBench\TestProtos</TargetDirectory>
-    </GeneratedSource>
-  </ItemGroup>
-  <!-- Package Items -->
-  <ItemGroup>
-    <StaticPackageItem Include="$(ProjectDirectory)\CHANGES.txt" />
-    <StaticPackageItem Include="$(ProjectDirectory)\license.txt" />
-    <StaticPackageItem Include="$(ProjectDirectory)\protos\google\protobuf\descriptor.proto">
-      <TargetDirectory>\protos\google\protobuf</TargetDirectory>
-    </StaticPackageItem>
-    <StaticPackageItem Include="$(ProjectDirectory)\protos\google\protobuf\compiler\plugin.proto">
-      <TargetDirectory>\protos\google\protobuf\compiler</TargetDirectory>
-    </StaticPackageItem>
-    <StaticPackageItem Include="$(ProjectDirectory)\protos\google\protobuf\csharp_options.proto">
-      <TargetDirectory>\protos\google\protobuf</TargetDirectory>
-    </StaticPackageItem>
-    <StaticPackageItem Include="$(ProjectDirectory)\protos\tutorial\addressbook.proto">
-      <TargetDirectory>\protos\tutorial</TargetDirectory>
-    </StaticPackageItem>
-  </ItemGroup>
-  <!-- Tools -->
-  <ItemGroup>
-    <ToolsTestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\NET35\Release\Google.ProtocolBuffers.ProtoGen.Test.dll" />
-
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtocolBuffers\bin\NET35\Release\Google.ProtocolBuffers.dll" />
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\NET35\Release\Google.ProtocolBuffers.Serialization.dll" />
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtoGen\bin\NET35\Release\ProtoGen.exe" />
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtoGen\bin\NET35\Release\ProtoGen.exe.config" />
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtoMunge\bin\NET35\Release\ProtoMunge.exe" />
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtoDump\bin\NET35\Release\ProtoDump.exe" />
-    <ToolsOutputItem Include="$(SourceDirectory)\ProtoBench\bin\NET35\Release\ProtoBench.exe" />
-    <ToolsOutputItem Include="$(LibDirectory)\protoc.exe" />
-    <ToolsOutputItem Include="$(LibDirectory)\protoc-license.txt" />
-  </ItemGroup>
-  <!-- Temporary Directories -->
-  <ItemGroup>
-    <TempBuildFolder Include="$(BuildTempDirectory)" />
-    <TempBuildFolder Include="$(BuildOutputDirectory)" />
-    <TempBuildFolder Include="$(SourceDirectory)\AddressBook\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\AddressBook\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoBench\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoBench\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffers\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffers\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffers.Serialization\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffers.Test\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffers.Test\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffersLite.Test\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoDump\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoDump\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoGen\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoGen\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoGen.Test\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoGen.Test\bin" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoMunge\obj" />
-    <TempBuildFolder Include="$(SourceDirectory)\ProtoMunge\bin" />
-  </ItemGroup>
-</Project>

csharp/build/googlecode_upload.py

@@ -1,248 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, 2007 Google Inc. All Rights Reserved.
-# Author: danderson@google.com (David Anderson)
-#
-# Script for uploading files to a Google Code project.
-#
-# This is intended to be both a useful script for people who want to
-# streamline project uploads and a reference implementation for
-# uploading files to Google Code projects.
-#
-# To upload a file to Google Code, you need to provide a path to the
-# file on your local machine, a small summary of what the file is, a
-# project name, and a valid account that is a member or owner of that
-# project.  You can optionally provide a list of labels that apply to
-# the file.  The file will be uploaded under the same name that it has
-# in your local filesystem (that is, the "basename" or last path
-# component).  Run the script with '--help' to get the exact syntax
-# and available options.
-#
-# Note that the upload script requests that you enter your
-# googlecode.com password.  This is NOT your Gmail account password!
-# This is the password you use on googlecode.com for committing to
-# Subversion and uploading files.  You can find your password by going
-# to http://code.google.com/hosting/settings when logged in with your
-# Gmail account. If you have already committed to your project's
-# Subversion repository, the script will automatically retrieve your
-# credentials from there (unless disabled, see the output of '--help'
-# for details).
-#
-# If you are looking at this script as a reference for implementing
-# your own Google Code file uploader, then you should take a look at
-# the upload() function, which is the meat of the uploader.  You
-# basically need to build a multipart/form-data POST request with the
-# right fields and send it to https://PROJECT.googlecode.com/files .
-# Authenticate the request using HTTP Basic authentication, as is
-# shown below.
-#
-# Licensed under the terms of the Apache Software License 2.0:
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Questions, comments, feature requests and patches are most welcome.
-# Please direct all of these to the Google Code users group:
-#  http://groups.google.com/group/google-code-hosting
-
-"""Google Code file uploader script.
-"""
-
-__author__ = 'danderson@google.com (David Anderson)'
-
-import httplib
-import os.path
-import optparse
-import getpass
-import base64
-import sys
-
-
-def upload(file, project_name, user_name, password, summary, labels=None):
-  """Upload a file to a Google Code project's file server.
-
-  Args:
-    file: The local path to the file.
-    project_name: The name of your project on Google Code.
-    user_name: Your Google account name.
-    password: The googlecode.com password for your account.
-              Note that this is NOT your global Google Account password!
-    summary: A small description for the file.
-    labels: an optional list of label strings with which to tag the file.
-
-  Returns: a tuple:
-    http_status: 201 if the upload succeeded, something else if an
-                 error occured.
-    http_reason: The human-readable string associated with http_status
-    file_url: If the upload succeeded, the URL of the file on Google
-              Code, None otherwise.
-  """
-  # The login is the user part of user@gmail.com. If the login provided
-  # is in the full user@domain form, strip it down.
-  if user_name.endswith('@gmail.com'):
-    user_name = user_name[:user_name.index('@gmail.com')]
-
-  form_fields = [('summary', summary)]
-  if labels is not None:
-    form_fields.extend([('label', l.strip()) for l in labels])
-
-  content_type, body = encode_upload_request(form_fields, file)
-
-  upload_host = '%s.googlecode.com' % project_name
-  upload_uri = '/files'
-  auth_token = base64.b64encode('%s:%s'% (user_name, password))
-  headers = {
-    'Authorization': 'Basic %s' % auth_token,
-    'User-Agent': 'Googlecode.com uploader v0.9.4',
-    'Content-Type': content_type,
-    }
-
-  server = httplib.HTTPSConnection(upload_host)
-  server.request('POST', upload_uri, body, headers)
-  resp = server.getresponse()
-  server.close()
-
-  if resp.status == 201:
-    location = resp.getheader('Location', None)
-  else:
-    location = None
-  return resp.status, resp.reason, location
-
-
-def encode_upload_request(fields, file_path):
-  """Encode the given fields and file into a multipart form body.
-
-  fields is a sequence of (name, value) pairs. file is the path of
-  the file to upload. The file will be uploaded to Google Code with
-  the same file name.
-
-  Returns: (content_type, body) ready for httplib.HTTP instance
-  """
-  BOUNDARY = '----------Googlecode_boundary_reindeer_flotilla'
-  CRLF = '\r\n'
-
-  body = []
-
-  # Add the metadata about the upload first
-  for key, value in fields:
-    body.extend(
-      ['--' + BOUNDARY,
-       'Content-Disposition: form-data; name="%s"' % key,
-       '',
-       value,
-       ])
-
-  # Now add the file itself
-  file_name = os.path.basename(file_path)
-  f = open(file_path, 'rb')
-  file_content = f.read()
-  f.close()
-
-  body.extend(
-    ['--' + BOUNDARY,
-     'Content-Disposition: form-data; name="filename"; filename="%s"'
-     % file_name,
-     # The upload server determines the mime-type, no need to set it.
-     'Content-Type: application/octet-stream',
-     '',
-     file_content,
-     ])
-
-  # Finalize the form body
-  body.extend(['--' + BOUNDARY + '--', ''])
-
-  return 'multipart/form-data; boundary=%s' % BOUNDARY, CRLF.join(body)
-
-
-def upload_find_auth(file_path, project_name, summary, labels=None,
-                     user_name=None, password=None, tries=3):
-  """Find credentials and upload a file to a Google Code project's file server.
-
-  file_path, project_name, summary, and labels are passed as-is to upload.
-
-  Args:
-    file_path: The local path to the file.
-    project_name: The name of your project on Google Code.
-    summary: A small description for the file.
-    labels: an optional list of label strings with which to tag the file.
-    config_dir: Path to Subversion configuration directory, 'none', or None.
-    user_name: Your Google account name.
-    tries: How many attempts to make.
-  """
-
-  while tries > 0:
-    if user_name is None:
-      # Read username if not specified or loaded from svn config, or on
-      # subsequent tries.
-      sys.stdout.write('Please enter your googlecode.com username: ')
-      sys.stdout.flush()
-      user_name = sys.stdin.readline().rstrip()
-    if password is None:
-      # Read password if not loaded from svn config, or on subsequent tries.
-      print 'Please enter your googlecode.com password.'
-      print '** Note that this is NOT your Gmail account password! **'
-      print 'It is the password you use to access Subversion repositories,'
-      print 'and can be found here: http://code.google.com/hosting/settings'
-      password = getpass.getpass()
-
-    status, reason, url = upload(file_path, project_name, user_name, password,
-                                 summary, labels)
-    # Returns 403 Forbidden instead of 401 Unauthorized for bad
-    # credentials as of 2007-07-17.
-    if status in [httplib.FORBIDDEN, httplib.UNAUTHORIZED]:
-      # Rest for another try.
-      user_name = password = None
-      tries = tries - 1
-    else:
-      # We're done.
-      break
-
-  return status, reason, url
-
-
-def main():
-  parser = optparse.OptionParser(usage='googlecode-upload.py -s SUMMARY '
-                                 '-p PROJECT [options] FILE')
-  parser.add_option('-s', '--summary', dest='summary',
-                    help='Short description of the file')
-  parser.add_option('-p', '--project', dest='project',
-                    help='Google Code project name')
-  parser.add_option('-u', '--user', dest='user',
-                    help='Your Google Code username')
-  parser.add_option('-w', '--password', dest='password',
-                    help='Your Google Code password')
-  parser.add_option('-l', '--labels', dest='labels',
-                    help='An optional list of comma-separated labels to attach '
-                    'to the file')
-
-  options, args = parser.parse_args()
-
-  if not options.summary:
-    parser.error('File summary is missing.')
-  elif not options.project:
-    parser.error('Project name is missing.')
-  elif len(args) < 1:
-    parser.error('File to upload not provided.')
-  elif len(args) > 1:
-    parser.error('Only one file may be specified.')
-
-  file_path = args[0]
-
-  if options.labels:
-    labels = options.labels.split(',')
-  else:
-    labels = None
-
-  status, reason, url = upload_find_auth(file_path, options.project,
-                                         options.summary, labels,
-                                         options.user, options.password)
-  if url:
-    print 'The file was uploaded successfully.'
-    print 'URL: %s' % url
-    return 0
-  else:
-    print 'An error occurred. Your file was not uploaded.'
-    print 'Google Code upload server said: %s (%s)' % (reason, status)
-    return 1
-
-
-if __name__ == '__main__':
-  sys.exit(main())

csharp/build/nuspec.xsd

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- original location: https://hg01.codeplex.com/nuget/raw-file/tip/src/Core/Authoring/nuspec.xsd -->
-<xs:schema id="nuspec" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:element name="package">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="metadata" maxOccurs="1" minOccurs="1">
-                    <xs:complexType>
-                        <xs:all>
-                            <xs:element name="id" maxOccurs="1" minOccurs="1" type="xs:string" />
-                            <xs:element name="version" maxOccurs="1" minOccurs="1" type="xs:string" />
-                            <xs:element name="title" maxOccurs="1" minOccurs="0" type="xs:string" />
-                            <xs:element name="authors" maxOccurs="1" minOccurs="1" type="xs:string" />
-                            <xs:element name="owners" maxOccurs="1" minOccurs="0" type="xs:string" />
-                            <xs:element name="licenseUrl" maxOccurs="1" minOccurs="0" type="xs:anyURI" />
-                            <xs:element name="projectUrl" maxOccurs="1" minOccurs="0" type="xs:anyURI" />
-                            <xs:element name="iconUrl" maxOccurs="1" minOccurs="0" type="xs:anyURI" />
-                            <xs:element name="requireLicenseAcceptance" maxOccurs="1" minOccurs="0" type="xs:boolean" />
-                            <xs:element name="description" maxOccurs="1" minOccurs="1" type="xs:string" />
-                            <xs:element name="summary" maxOccurs="1" minOccurs="0" type="xs:string" />
-                            <xs:element name="releaseNotes" maxOccurs="1" minOccurs="0" type="xs:string" />
-                            <xs:element name="copyright" maxOccurs="1" minOccurs="0" type="xs:string" />
-                            <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:string" default="en-US" />
-                            <xs:element name="tags" maxOccurs="1" minOccurs="0" type="xs:string" />
-                            <xs:element name="dependencies" maxOccurs="1" minOccurs="0">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="dependency" minOccurs="0" maxOccurs="unbounded">
-                                            <xs:complexType>
-                                                <xs:attribute name="id" type="xs:string" use="required" />
-                                                <xs:attribute name="version" type="xs:string" use="optional" />
-                                            </xs:complexType>
-                                        </xs:element>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="frameworkAssemblies" maxOccurs="1" minOccurs="0">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="frameworkAssembly" minOccurs="0" maxOccurs="unbounded">
-                                            <xs:complexType>
-                                                <xs:attribute name="assemblyName" type="xs:string" use="required" />
-                                                <xs:attribute name="targetFramework" type="xs:string" use="optional" />
-                                            </xs:complexType>
-                                        </xs:element>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="references" maxOccurs="1" minOccurs="0">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="reference" minOccurs="0" maxOccurs="unbounded">
-                                            <xs:complexType>
-                                                <xs:attribute name="file" type="xs:string" use="required" />
-                                            </xs:complexType>
-                                        </xs:element>
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:all>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="files" minOccurs="0" maxOccurs="1" nillable="true">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="file" minOccurs="0" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:attribute name="src" use="required" type="xs:string" />
-                                    <xs:attribute name="target" use="optional" type="xs:string" />
-                                    <xs:attribute name="exclude" use="optional" type="xs:string" />
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>

csharp/build/publish.csproj

@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Publish" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- build targets -->
-  <Target Name="Clean" DependsOnTargets="_Clean" />
-  <Target Name="Build" DependsOnTargets="_Clean;_Prerequisites;_StampVersion;_GenerateSource;_Build" />
-  <Target Name="Label" DependsOnTargets="_HgLabel" />
-  <Target Name="Package" DependsOnTargets="_HgPack;_NugetPack" />
-  <Target Name="Prepare" DependsOnTargets="Clean;Build;Label;Package" />
-  <Target Name="PushAll" DependsOnTargets="_HgPush;_NugetPush" />
-  <Target Name="Publish" DependsOnTargets="Prepare;PushAll" />
-
-  <PropertyGroup>
-    <ProjectName>Protocol Buffers</ProjectName>
-    <VersionMajor>2</VersionMajor>
-    <VersionMinor>4</VersionMinor>
-    <VersionBuild>1</VersionBuild>
-    <VersionRevision></VersionRevision>
-    <VersionLabel></VersionLabel>
-
-    <PackagePrefix>protobuf-csharp-port-</PackagePrefix>
-    <PublishDebug>false</PublishDebug>
-    
-    <GoogleUsername></GoogleUsername>
-    <GooglePassword></GooglePassword>
-    
-    <!--Directory Paths-->
-    <ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory>
-    <BuildTempDirectory>$(ProjectDirectory)\build_temp</BuildTempDirectory>
-    <BuildOutputDirectory>$(ProjectDirectory)\build_output</BuildOutputDirectory>
-    <SourceDirectory>$(ProjectDirectory)\src</SourceDirectory>
-    <LibDirectory>$(ProjectDirectory)\lib</LibDirectory>
-    
-    <!-- File Paths -->
-    <SigningKey>$(ProjectDirectory)\release-key\Google.ProtocolBuffers.snk</SigningKey>
-    
-    <!--Tool Paths-->
-    <HgTool>hg.exe</HgTool>
-    <Python>C:\Python25\python.exe</Python>
-    <SnTool>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)Bin\sn.exe</SnTool>
-    <StampVer>$(LibDirectory)\StampVersion.exe</StampVer>
-    <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath>
-    <NuGet>$(LibDirectory)\NuGet.exe</NuGet>
-    <ProtogenExePath>$(BuildOutputDirectory)\tools\protogen.exe</ProtogenExePath>
-  </PropertyGroup>
-  
-  <!-- Import user settings -->
-  <Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')" />
-
-  <!-- Files -->
-  <ItemGroup>
-  </ItemGroup>
-  
-  <!-- Tasks -->
-
-  <Target Name="_Prerequisites" DependsOnTargets="_CheckEnvironment;_ReadVersion" />
-  
-  <Target Name="_Clean">
-    <MSBuild Properties="Configuration=Debug;" Targets="Clean" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MSBuild Properties="Configuration=Release;" Targets="Clean" Projects="$(MSBuildProjectDirectory)\target.csproj" />
-    <MakeDir Directories="$(BuildTempDirectory)" />
-    <MakeDir Directories="$(BuildOutputDirectory)" />
-  </Target>
-
-  <Target Name="_WriteUserConfig">
-    <ItemGroup>
-      <Lines Include="&lt;Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>" />
-      <Lines Include="  &lt;PropertyGroup>"/>
-      <Lines Include="    &lt;GoogleUsername> (Enter your google-code user/password here) &lt;/GoogleUsername>"/>
-      <Lines Include="    &lt;GooglePassword>&lt;/GooglePassword>"/>
-      <Lines Include="  &lt;/PropertyGroup>" />
-      <Lines Include="&lt;/Project>" />
-    </ItemGroup>
-    <WriteLinesToFile File="$(MSBuildProjectFullPath).user" Lines="@(Lines)" Overwrite="true" Condition="!Exists('$(MSBuildProjectFullPath).user')" />
-    <Exec Command="Notepad.exe $(MSBuildProjectFullPath).user" />
-  </Target>
-  
-  <Target Name="_CheckEnvironment">
-    <!-- Require google credentials -->
-    <CallTarget Targets="_WriteUserConfig" Condition=" '$(GooglePassword)' == '' " />
-    <Error Text="Restart after you verify your credentials in $(MSBuildProjectFullPath).user" Condition=" '$(GooglePassword)' == '' " />
-    <!-- Require Win7.0A SDK to verify strong-name -->
-    <Error Text="Unable to locate Win7SDK Tools: $(SnTool)" Condition="!Exists($(SnTool))" />
-    <!-- Require Python 2.5 installed -->
-    <!-- Error Text="Unable to locate Python 2.5: $(Python)" Condition="!Exists($(Python))" / -->
-    <!-- Require production signing key -->
-    <Exec Command="$(HgTool) clone https://bitbucket.org/rknapp/protobuf-csharp-port-keyfile $(ProjectDirectory)\release-key" Condition="!Exists('$(SigningKey)')" />
-    <Error Text="Unable to locate release signing key: $(SigningKey)" Condition="!Exists($(SigningKey))" />
-  </Target>
-
-  <Target Name="_ReadVersion" Condition=" '$(VersionLabel)' == '' ">
-    <Exec Command="$(HgTool) log -l 1 --template &quot;{rev}&quot; > &quot;$(BuildTempDirectory)\revision.txt&quot;"></Exec>
-    <ReadLinesFromFile File="$(BuildTempDirectory)\revision.txt">
-      <Output TaskParameter="Lines" PropertyName="VersionRevision"/>
-    </ReadLinesFromFile>
-
-    <PropertyGroup>
-      <VersionLabel>$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)</VersionLabel>
-    </PropertyGroup>
-    
-    <Message Text="Building version $(VersionLabel)" Importance="high" />
-  </Target>
-
-  <Target Name="_StampVersion" DependsOnTargets="_Prerequisites">
-    <Exec Command="$(StampVer) /major:$(VersionMajor) /minor:$(VersionMinor) /build:$(VersionBuild) /revision:$(VersionRevision)" WorkingDirectory="$(SourceDirectory)" />
-    <Exec Command="FIND &quot;$(VersionLabel)&quot; ProtocolBuffers\Properties\AssemblyInfo.cs" WorkingDirectory="$(SourceDirectory)" />
-  </Target>
-
-  <Target Name="_GenerateSource" DependsOnTargets="_Prerequisites">
-    <MSBuild Properties="Configuration=Release;AssemblyOriginatorKeyFile=$(SigningKey)" Targets="GenerateProjects;BuildTools;GenerateSource" Projects="$(MSBuildProjectDirectory)\build.csproj" />
-    <Exec Command="&quot;$(SnTool)&quot; -T &quot;$(ProtogenExePath)&quot; > signkey.txt" WorkingDirectory="$(BuildTempDirectory)" />
-    <!-- Make sure we are signing with the correct key -->
-    <Exec Command="FIND &quot;55f7125234beb589&quot; signkey.txt" WorkingDirectory="$(BuildTempDirectory)" />
-  </Target>
-  
-  <Target Name="_Build" DependsOnTargets="_Prerequisites">
-    <!-- Release Build -->
-    <MSBuild Properties="Configuration=Release;AssemblyOriginatorKeyFile=$(SigningKey)" Targets="_CompileAll" Projects="$(MSBuildProjectDirectory)\build.csproj" />
-    <MSBuild Properties="Configuration=Release;AssemblyOriginatorKeyFile=$(SigningKey);PackageName=$(PackagePrefix)$(VersionLabel)-release" Targets="GeneratePackage" Projects="$(MSBuildProjectDirectory)\build.csproj" />
-    <!-- Debug Build -->
-    <MSBuild Condition=" '$(PublishDebug)' == 'true' " Properties="Configuration=Debug;AssemblyOriginatorKeyFile=$(SigningKey)" Targets="_CompileAll" Projects="$(MSBuildProjectDirectory)\build.csproj" />
-    <MSBuild Condition=" '$(PublishDebug)' == 'true' " Properties="Configuration=Debug;AssemblyOriginatorKeyFile=$(SigningKey);PackageName=$(PackagePrefix)$(VersionLabel)-full" Targets="GeneratePackage" Projects="$(MSBuildProjectDirectory)\build.csproj" />
-  </Target>
-
-  <Target Name="_HgPack" DependsOnTargets="_Prerequisites">
-    <Exec Command="$(HgTool) archive $(BuildTempDirectory)\$(PackagePrefix)$(VersionLabel)-source.zip" WorkingDirectory="$(ProjectDirectory)" />
-  </Target>
-  
-  <Target Name="_HgLabel" DependsOnTargets="_Prerequisites">
-    <Exec Command="$(HgTool) commit -m &quot;version $(VersionLabel)&quot;" WorkingDirectory="$(ProjectDirectory)" />
-    <Exec Command="$(HgTool) tag $(VersionLabel)" WorkingDirectory="$(ProjectDirectory)" />
-  </Target>
-  
-  <Target Name="_HgPush" DependsOnTargets="_Prerequisites">
-    <Exec Command="$(HgTool) push" WorkingDirectory="$(ProjectDirectory)" />
-  </Target>
-
-  <Target Name="_PkgPush" DependsOnTargets="_Prerequisites">
-    <PropertyGroup>
-      <UploadPackage>$(Python) "$(MSBuildProjectDirectory)\googlecode_upload.py" --project protobuf-csharp-port --user "$(GoogleUsername)" --password "$(GooglePassword)"</UploadPackage>
-      
-      <SourcePackage>$(BuildTempDirectory)\$(PackagePrefix)$(VersionLabel)-source.zip</SourcePackage>
-      <ReleasePackageBin>$(BuildTempDirectory)\$(PackagePrefix)$(VersionLabel)-release-binaries.zip</ReleasePackageBin>
-      <ReleasePackageSyb>$(BuildTempDirectory)\$(PackagePrefix)$(VersionLabel)-release-symbols.zip</ReleasePackageSyb>
-      <DebugPackageBin>$(BuildTempDirectory)\$(PackagePrefix)$(VersionLabel)-full-binaries.zip</DebugPackageBin>
-      <DebugPackageSyb>$(BuildTempDirectory)\$(PackagePrefix)$(VersionLabel)-full-symbols.zip</DebugPackageSyb>
-    </PropertyGroup>
-
-    <Error Condition="!Exists('$(SourcePackage)')" Text="File not found: $(SourcePackage)" />
-    <Error Condition="!Exists('$(ReleasePackageBin)')" Text="File not found: $(ReleasePackageBin)" />
-    <Error Condition="!Exists('$(ReleasePackageSyb)')" Text="File not found: $(ReleasePackageSyb)" />
-    <Error Condition="'$(PublishDebug)' == 'true' And !Exists('$(DebugPackageBin)')" Text="File not found: $(DebugPackageBin)" />
-    <Error Condition="'$(PublishDebug)' == 'true' And !Exists('$(DebugPackageSyb)')" Text="File not found: $(DebugPackageSyb)" />
-
-    <Exec WorkingDirectory="$(ProjectDirectory)"
-          Command="$(UploadPackage) --labels Type-Source,Featured --summary &quot;Version $(VersionLabel) source&quot; $(SourcePackage)" />
-    
-    <Exec WorkingDirectory="$(ProjectDirectory)"
-          Command="$(UploadPackage) --labels Type-Executable,Featured --summary &quot;Version $(VersionLabel) release binaries only&quot; $(ReleasePackageBin)" />
-    <Exec WorkingDirectory="$(ProjectDirectory)"
-          Command="$(UploadPackage) --labels Type-Executable,Featured --summary &quot;Version $(VersionLabel) release binaries and symbols&quot; $(ReleasePackageSyb)" />
-
-    <Exec WorkingDirectory="$(ProjectDirectory)" Condition=" '$(PublishDebug)' == 'true' "
-          Command="$(UploadPackage) --labels Type-Executable,Featured --summary &quot;Version $(VersionLabel) all binaries&quot; $(DebugPackageBin)" />
-    <Exec WorkingDirectory="$(ProjectDirectory)" Condition=" '$(PublishDebug)' == 'true' "
-          Command="$(UploadPackage) --labels Type-Executable,Featured --summary &quot;Version $(VersionLabel) all binaries and symbols&quot; $(DebugPackageSyb)" />
-  </Target>
-
-  <Target Name="_NugetPack" DependsOnTargets="_Prerequisites">
-    <Exec WorkingDirectory="$(MSBuildProjectDirectory)"
-      Command="$(NuGet) update -self" />
-    <Exec WorkingDirectory="$(MSBuildProjectDirectory)"
-      Command="$(NuGet) pack Google.ProtocolBuffers.nuspec -Symbols -Version $(VersionLabel) -NoPackageAnalysis -OutputDirectory $(BuildTempDirectory)" />
-    <Exec WorkingDirectory="$(MSBuildProjectDirectory)"
-      Command="$(NuGet) pack Google.ProtocolBuffersLite.nuspec -Symbols -Version $(VersionLabel) -NoPackageAnalysis -OutputDirectory $(BuildTempDirectory)" />
-  </Target>
-
-  <Target Name="_NugetPush" DependsOnTargets="_Prerequisites">
-    <Exec WorkingDirectory="$(BuildTempDirectory)" Command="$(NuGet) push Google.ProtocolBuffers.$(VersionLabel).nupkg" ContinueOnError="true" />
-    <Exec WorkingDirectory="$(BuildTempDirectory)" Command="$(NuGet) push Google.ProtocolBuffersLite.$(VersionLabel).nupkg" ContinueOnError="true" />
-
-    <Exec WorkingDirectory="$(BuildTempDirectory)" Command="$(NuGet) push Google.ProtocolBuffers.$(VersionLabel).symbols.nupkg" ContinueOnError="true" />
-    <Exec WorkingDirectory="$(BuildTempDirectory)" Command="$(NuGet) push Google.ProtocolBuffersLite.$(VersionLabel).symbols.nupkg" ContinueOnError="true" />
-  </Target>
-  
-</Project>

csharp/build/target.csproj

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-<!-- **********************************************************************************************
-High-level Targets
-*********************************************************************************************** -->
-
-  <Target Name="Clean" DependsOnTargets="_Clean" />
-  <Target Name="Build" DependsOnTargets="_Compile;_Test" />
-  <Target Name="Test" DependsOnTargets="_Test" />
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="Publish" DependsOnTargets="Clean;Build;_Publish" />
-
-  <!-- **********************************************************************************************
-Properties
-*********************************************************************************************** -->
-
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
-    <TargetVersion Condition=" '$(TargetVersion)' == '' ">NET20</TargetVersion>
-    <BuildParams></BuildParams>
-
-    <!--Directory Paths-->
-    <ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory>
-    <SourceDirectory>$(ProjectDirectory)\src</SourceDirectory>
-    <LibDirectory>$(ProjectDirectory)\lib</LibDirectory>
-
-    <!--File Paths-->
-    <BuildTempDirectory>$(ProjectDirectory)\build_temp\$(Configuration)\$(TargetVersion)</BuildTempDirectory>
-    <BuildOutputDirectory>$(ProjectDirectory)\build_output\$(Configuration)\$(TargetVersion)</BuildOutputDirectory>
-    <SolutionFile>$(SourceDirectory)\ProtocolBuffersLibrary.$(TargetVersion).sln</SolutionFile>
-
-    <!--Tool Paths-->
-    <NUnitExePath>$(LibDirectory)\NUnit\tools\nunit-console.exe</NUnitExePath>
-    <StatLightExePath>$(LibDirectory)\StatLight\tools\StatLight.exe</StatLightExePath>
-  </PropertyGroup>
-
-<!-- **********************************************************************************************
-Target Versions
-*********************************************************************************************** -->
-
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'NET20' ">
-    <BuildTools>3.5</BuildTools>
-    <TestFramework>NUNIT</TestFramework>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'NET35' ">
-    <BuildTools>3.5</BuildTools>
-    <TestFramework>NUNIT</TestFramework>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'NET40' ">
-    <BuildTools>4.0</BuildTools>
-    <TestFramework>NUNIT</TestFramework>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'CF20' ">
-    <BuildTools>3.5</BuildTools>
-    <TestFramework>NONE</TestFramework>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'CF35' ">
-    <BuildTools>3.5</BuildTools>
-    <TestFramework>NONE</TestFramework>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'SL20' ">
-    <BuildTools>3.5</BuildTools>
-    <TestFramework>SILVERLIGHT</TestFramework>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'SL30' ">
-    <BuildTools>3.5</BuildTools>
-    <TestFramework>SILVERLIGHT</TestFramework>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'SL40' ">
-    <BuildTools>4.0</BuildTools>
-    <TestFramework>SILVERLIGHT</TestFramework>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetVersion)' == 'PL40' ">
-    <BuildTools>4.0</BuildTools>
-    <TestFramework>SILVERLIGHT</TestFramework>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <BuildOutputDirectory>$(ProjectDirectory)\build_output\$(Configuration)\portable-net40+sl4+sl5+wp7+wp8+win8</BuildOutputDirectory>
-  </PropertyGroup>
-
-<!-- **********************************************************************************************
-File Groups
-*********************************************************************************************** -->
-
-  <ItemGroup>
-    <WorkingDirectories Include="$(BuildTempDirectory)" />
-    <WorkingDirectories Include="$(BuildOutputDirectory)" />
-    
-    <TestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.Test.dll" />
-    <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.Test.dll" />
-    <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersMixedLite.Test.dll" />
-
-    <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.Test.xap" />
-    <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.Test.xap" />
-    <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersMixedLite.Test.xap" />
-
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.dll" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.pdb" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.xml" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.dll" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.pdb" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.xml" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.Serialization.dll" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.Serialization.pdb" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffers.Serialization.xml" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.Serialization.dll" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.Serialization.pdb" />
-    <PublishItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(TargetVersion)\$(Configuration)\Google.ProtocolBuffersLite.Serialization.xml" />
-  </ItemGroup>
-
-<!-- **********************************************************************************************
-Targets For Build
-*********************************************************************************************** -->
-
-  <Target Name="_Configured">
-    <Message Text="Building $(TargetVersion) for configuration $(Configuration), platform $(Platform)" Importance="normal" />
-    <Error Text="Unknown or missing value for TargetVersion=[value]" Condition=" '$(BuildTools)' == '' " />
-  </Target>
-  
-  <Target Name="_Clean" DependsOnTargets="_Configured">
-    <RemoveDir Directories="@(WorkingDirectories)" Condition="Exists(%(WorkingDirectories.Identity))" />
-    <MSBuild Targets="Clean" Projects="$(SolutionFile)" ToolsVersion="$(BuildTools)"
-             Properties="Configuration=$(Configuration);Platform=$(Platform);"
-             />
-  </Target>
-
-  <Target Name="_Compile" DependsOnTargets="_Configured">
-    <MSBuild Targets="Build" Projects="$(SolutionFile)" ToolsVersion="$(BuildTools)"
-             Properties="Configuration=$(Configuration);Platform=$(Platform);$(BuildParams)"
-             />
-  </Target>
-
-  <Target Name="_Publish" DependsOnTargets="_Configured">
-    <MakeDir Directories="$(BuildOutputDirectory)" />
-    <Copy SourceFiles="@(PublishItem)" DestinationFolder="$(BuildOutputDirectory)" />
-  </Target>
-
-<!-- **********************************************************************************************
-Targets For Test
-*********************************************************************************************** -->
-
-  <Target Name="_Test" DependsOnTargets="_Configured">
-    <MakeDir Directories="$(BuildTempDirectory)" />
-    <CallTarget Targets="_RunNunit" Condition=" '$(TestFramework)'=='NUNIT' " />
-    <CallTarget Targets="_RunStatLight" Condition=" '$(TestFramework)'=='SILVERLIGHT' " />
-  </Target>
-
-  <Target Name="_RunNunit">
-    <Copy SourceFiles="$(LibDirectory)\NUnit-config\nunit-console.$(TargetFrameworkVersion).config" DestinationFiles="$(NUnitExePath).config" />
-    <Exec Command="&quot;$(NUnitExePath)&quot; /nologo /noshadow &quot;%(TestContainer.Identity)&quot; /xml:&quot;$(BuildTempDirectory)\%(TestContainer.Filename).xml&quot;" />
-  </Target>
-
-  <Target Name="_RunStatLight">
-    <Exec
-      Command="&quot;$(StatLightExePath)&quot; -x %(StatLightTestContainer.Identity) --ReportOutputFileType=NUnit --ReportOutputFile=$(BuildTempDirectory)\%(StatLightTestContainer.Filename).xml" />
-  </Target>
-
-</Project>

csharp/protos/extest/unittest_extras_full.proto

@@ -1,71 +0,0 @@
-syntax = "proto2";
-
-package protobuf_unittest_extra;
-
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-option optimize_for = CODE_SIZE;
-option java_package = "com.google.protobuf";
-
-message TestInteropPerson {
-  required string name = 1;
-  required int32 id = 2;
-  optional string email = 3;
-  repeated int32 codes = 10 [packed=true];
-
-  enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
-  }
-
-  message PhoneNumber {
-    required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
-  }
-
-  repeated PhoneNumber phone = 4;
-  
-  repeated group Addresses = 5 {
-    required string address = 1;
-    optional string address2 = 2;
-    required string city = 3;
-    required string state = 4;
-    required fixed32 zip = 5;
-  }
-
-  extensions 100 to 199;
-}
-
-message  TestInteropEmployeeId {
-  required string number = 1;
-}
-  
-extend TestInteropPerson {
-  // Note: changed from required to optional, as required fields are not
-  // permitted in extensions. (The fact that this was allowed in protogen
-  // before was almost certainly a bug.)
-  optional TestInteropEmployeeId employee_id = 126;
-}
-
-message TestMissingFieldsA {
-  required string name = 1;
-  required int32 id = 2;
-  optional string email = 3;
-  
-  message SubA {
-    required int32 count = 5;
-    repeated string values = 6;
-  }
-  optional SubA testA = 11;
-}
-
-message TestMissingFieldsB {
-  required string name = 1;
-  required int32 id = 2;
-  optional string website = 4;
-  
-  message SubB {
-    repeated string values = 7;
-  }
-  optional SubB testB = 12;
-}

csharp/protos/extest/unittest_extras_lite.proto

@@ -1,115 +0,0 @@
-syntax = "proto2";
-
-package protobuf_unittest_extra;
-
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-option optimize_for = LITE_RUNTIME;
-option java_package = "com.google.protobuf";
-
-message TestRequiredLite {
-  required int32 d = 1;
-  required ExtraEnum en = 2 [default = DEFAULT];
-}
-
-enum ExtraEnum {
-  DEFAULT = 10;
-  EXLITE_FOO = 7;
-  EXLITE_BAR = 8;
-  EXLITE_BAZ = 9;
-}
-
-message TestInteropPersonLite {
-  required string name = 1;
-  required int32 id = 2;
-  optional string email = 3;
-  repeated int32 codes = 10 [packed=true];
-
-  enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
-  }
-
-  message PhoneNumber {
-    required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
-  }
-
-  repeated PhoneNumber phone = 4;
-  
-  repeated group Addresses = 5 {
-    required string address = 1;
-    optional string address2 = 2;
-    required string city = 3;
-    required string state = 4;
-    required fixed32 zip = 5;
-  }
-
-  extensions 100 to 199;
-}
-
-message  TestInteropEmployeeIdLite {
-  required string number = 1;
-}
-  
-extend TestInteropPersonLite {
-  // Note: changed from required to optional, as required fields are not
-  // permitted in extensions. (The fact that this was allowed in protogen
-  // before was almost certainly a bug.)
-  optional TestInteropEmployeeIdLite employee_id_lite = 126;
-}
-
-/* Removed from unittest_lite.proto and added back here */
-
-message TestUnpackedExtensionsLite {
-  extensions 1 to max;
-}
-
-message TestUnpackedTypesLite {
-  repeated    int32 unpacked_int32    =  90;
-  repeated    int64 unpacked_int64    =  91;
-  repeated   uint32 unpacked_uint32   =  92;
-  repeated   uint64 unpacked_uint64   =  93;
-  repeated   sint32 unpacked_sint32   =  94;
-  repeated   sint64 unpacked_sint64   =  95;
-  repeated  fixed32 unpacked_fixed32  =  96;
-  repeated  fixed64 unpacked_fixed64  =  97;
-  repeated sfixed32 unpacked_sfixed32 =  98;
-  repeated sfixed64 unpacked_sfixed64 =  99;
-  repeated    float unpacked_float    = 100;
-  repeated   double unpacked_double   = 101;
-  repeated     bool unpacked_bool     = 102;
-  repeated UnpackedTypesForeignEnumLite unpacked_enum  = 103;
-}
-
-extend TestUnpackedExtensionsLite {
-  repeated    int32 unpacked_int32_extension_lite    =  90;
-  repeated    int64 unpacked_int64_extension_lite    =  91;
-  repeated   uint32 unpacked_uint32_extension_lite   =  92;
-  repeated   uint64 unpacked_uint64_extension_lite   =  93;
-  repeated   sint32 unpacked_sint32_extension_lite   =  94;
-  repeated   sint64 unpacked_sint64_extension_lite   =  95;
-  repeated  fixed32 unpacked_fixed32_extension_lite  =  96;
-  repeated  fixed64 unpacked_fixed64_extension_lite  =  97;
-  repeated sfixed32 unpacked_sfixed32_extension_lite =  98;
-  repeated sfixed64 unpacked_sfixed64_extension_lite =  99;
-  repeated    float unpacked_float_extension_lite    = 100;
-  repeated   double unpacked_double_extension_lite   = 101;
-  repeated     bool unpacked_bool_extension_lite     = 102;
-  repeated UnpackedTypesForeignEnumLite unpacked_enum_extension_lite = 103;
-}
-
-enum UnpackedTypesForeignEnumLite {
-  FOREIGN_LITE_FOO = 4;
-  FOREIGN_LITE_BAR = 5;
-  FOREIGN_LITE_BAZ = 6;
-}
-
-message BucketOfBytes {
-    optional bytes value = 1;
-    
-}
-message BucketOfBytesEx {
-    optional bytes value = 1;
-    optional bytes value2 = 255;
-}

csharp/protos/extest/unittest_extras_xmltest.proto

@@ -1,53 +0,0 @@
-syntax = "proto2";
-
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
-package protobuf_unittest_extra;
-
-option optimize_for = SPEED;
-
-enum EnumOptions {
-  ONE = 0;
-  TWO = 1;
-  THREE = 2;
-}
-
-message TestXmlChild {
-  repeated EnumOptions options = 3;
-  optional bytes binary = 4;
-}
-
-message TestXmlNoFields {
-}
-
-message TestXmlRescursive {
-  optional TestXmlRescursive child = 1;
-}
-
-message TestXmlMessage {
-
-  optional int64 number = 6;
-  repeated int32 numbers = 2;
-  optional string text = 3;
-  repeated string textlines = 700;
-  optional bool valid = 5;
-
-  optional TestXmlChild child = 1;
-  repeated group Children = 401 {
-    repeated EnumOptions options = 3;
-    optional bytes binary = 4;
-  }
-
-extensions 100 to 199;
-}
-
-message  TestXmlExtension {
-  required int32 number = 1;
-}
-
-extend TestXmlMessage {
-  optional EnumOptions extension_enum = 101;
-  optional string extension_text = 102;
-  repeated int32 extension_number = 103 [packed = true];
-  optional TestXmlExtension extension_message = 199;
-}

csharp/src/AddressBook/AddPerson.cs

@@ -36,9 +36,8 @@
 
 using System;
 using System.IO;
-using Google.Protobuf;
 
-namespace Google.ProtocolBuffers.Examples.AddressBook
+namespace Google.Protobuf.Examples.AddressBook
 {
     internal class AddPerson
     {

csharp/src/AddressBook/AddressBook.csproj

@@ -8,11 +8,11 @@
     <ProjectGuid>{A31F5FB2-4FF3-432A-B35B-5CD203606311}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Google.ProtocolBuffers.Examples.AddressBook</RootNamespace>
+    <RootNamespace>Google.Protobuf.Examples.AddressBook</RootNamespace>
     <AssemblyName>AddressBook</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <StartupObject>Google.ProtocolBuffers.Examples.AddressBook.Program</StartupObject>
+    <StartupObject>Google.Protobuf.Examples.AddressBook.Program</StartupObject>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

csharp/src/AddressBook/Addressbook.cs

@@ -7,18 +7,18 @@ using pb = global::Google.Protobuf;
 using pbc = global::Google.Protobuf.Collections;
 using pbd = global::Google.Protobuf.Descriptors;
 using scg = global::System.Collections.Generic;
-namespace Google.ProtocolBuffers.Examples.AddressBook {
+namespace Google.Protobuf.Examples.AddressBook {
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
   public static partial class Addressbook {
 
     #region Static variables
     internal static pbd::MessageDescriptor internal__static_tutorial_Person__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.Person> internal__static_tutorial_Person__FieldAccessorTable;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Google.Protobuf.Examples.AddressBook.Person> internal__static_tutorial_Person__FieldAccessorTable;
     internal static pbd::MessageDescriptor internal__static_tutorial_Person_PhoneNumber__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber> internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable;
     internal static pbd::MessageDescriptor internal__static_tutorial_AddressBook__Descriptor;
-    internal static pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook> internal__static_tutorial_AddressBook__FieldAccessorTable;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Google.Protobuf.Examples.AddressBook.AddressBook> internal__static_tutorial_AddressBook__FieldAccessorTable;
     #endregion
     #region Descriptor
     public static pbd::FileDescriptor Descriptor {
@@ -35,22 +35,22 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
             "TnVtYmVyEg4KBm51bWJlchgBIAIoCRIuCgR0eXBlGAIgASgOMhoudHV0b3Jp", 
             "YWwuUGVyc29uLlBob25lVHlwZToESE9NRSIrCglQaG9uZVR5cGUSCgoGTU9C", 
             "SUxFEAASCAoESE9NRRABEggKBFdPUksQAiIvCgtBZGRyZXNzQm9vaxIgCgZw", 
-            "ZXJzb24YASADKAsyEC50dXRvcmlhbC5QZXJzb25CVwoUY29tLmV4YW1wbGUu", 
-            "dHV0b3JpYWxCEUFkZHJlc3NCb29rUHJvdG9zqgIrR29vZ2xlLlByb3RvY29s", 
-          "QnVmZmVycy5FeGFtcGxlcy5BZGRyZXNzQm9vaw=="));
+            "ZXJzb24YASADKAsyEC50dXRvcmlhbC5QZXJzb25CUAoUY29tLmV4YW1wbGUu", 
+            "dHV0b3JpYWxCEUFkZHJlc3NCb29rUHJvdG9zqgIkR29vZ2xlLlByb3RvYnVm", 
+          "LkV4YW1wbGVzLkFkZHJlc3NCb29r"));
       pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
         descriptor = root;
         internal__static_tutorial_Person__Descriptor = Descriptor.MessageTypes[0];
         internal__static_tutorial_Person__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.Person>(internal__static_tutorial_Person__Descriptor,
+            new pb::FieldAccess.FieldAccessorTable<global::Google.Protobuf.Examples.AddressBook.Person>(internal__static_tutorial_Person__Descriptor,
                 new string[] { "Name", "Id", "Email", "Phone", });
         internal__static_tutorial_Person_PhoneNumber__Descriptor = internal__static_tutorial_Person__Descriptor.NestedTypes[0];
         internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber>(internal__static_tutorial_Person_PhoneNumber__Descriptor,
+            new pb::FieldAccess.FieldAccessorTable<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>(internal__static_tutorial_Person_PhoneNumber__Descriptor,
                 new string[] { "Number", "Type", });
         internal__static_tutorial_AddressBook__Descriptor = Descriptor.MessageTypes[1];
         internal__static_tutorial_AddressBook__FieldAccessorTable = 
-            new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.Examples.AddressBook.AddressBook>(internal__static_tutorial_AddressBook__Descriptor,
+            new pb::FieldAccess.FieldAccessorTable<global::Google.Protobuf.Examples.AddressBook.AddressBook>(internal__static_tutorial_AddressBook__Descriptor,
                 new string[] { "Person", });
       };
       pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
@@ -69,11 +69,11 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     private static readonly string[] _fieldNames = new string[] { "email", "id", "name", "phone" };
     private static readonly uint[] _fieldTags = new uint[] { 26, 16, 10, 34 };
     public static pbd::MessageDescriptor Descriptor {
-      get { return global::Google.ProtocolBuffers.Examples.AddressBook.Addressbook.internal__static_tutorial_Person__Descriptor; }
+      get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_Person__Descriptor; }
     }
 
     public pb::FieldAccess.FieldAccessorTable<Person> Fields {
-      get { return global::Google.ProtocolBuffers.Examples.AddressBook.Addressbook.internal__static_tutorial_Person__FieldAccessorTable; }
+      get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_Person__FieldAccessorTable; }
     }
 
     private bool _frozen = false;
@@ -131,8 +131,8 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     }
 
     public const int PhoneFieldNumber = 4;
-    private readonly pbc::RepeatedField<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber> phone_ = new pbc::RepeatedField<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber>();
-    public pbc::RepeatedField<global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber> Phone {
+    private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> phone_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>();
+    public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> Phone {
       get { return phone_; }
     }
 
@@ -193,7 +193,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(Email);
       }
       if (phone_.Count > 0) {
-        foreach (global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber element in phone_) {
+        foreach (global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber element in phone_) {
           size += pb::CodedOutputStream.ComputeMessageSize(element);
         }
         size += 1 * phone_.Count;
@@ -241,7 +241,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
             break;
           }
           case 34: {
-            input.ReadMessageArray(phone_, global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneNumber.Parser);
+            input.ReadMessageArray(phone_, global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser);
             break;
           }
         }
@@ -265,11 +265,11 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         private static readonly string[] _fieldNames = new string[] { "number", "type" };
         private static readonly uint[] _fieldTags = new uint[] { 10, 16 };
         public static pbd::MessageDescriptor Descriptor {
-          get { return global::Google.ProtocolBuffers.Examples.AddressBook.Addressbook.internal__static_tutorial_Person_PhoneNumber__Descriptor; }
+          get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_Person_PhoneNumber__Descriptor; }
         }
 
         public pb::FieldAccess.FieldAccessorTable<PhoneNumber> Fields {
-          get { return global::Google.ProtocolBuffers.Examples.AddressBook.Addressbook.internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable; }
+          get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable; }
         }
 
         private bool _frozen = false;
@@ -304,8 +304,8 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         }
 
         public const int TypeFieldNumber = 2;
-        private global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType.HOME;
-        public global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType Type {
+        private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME;
+        public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type {
           get { return type_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -332,7 +332,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
         public override int GetHashCode() {
           int hash = 1;
           if (Number.Length != 0) hash ^= Number.GetHashCode();
-          if (Type != global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType.HOME) hash ^= Type.GetHashCode();
+          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) hash ^= Type.GetHashCode();
           return hash;
         }
 
@@ -341,7 +341,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
             output.WriteRawTag(10);
             output.WriteString(Number);
           }
-          if (Type != global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType.HOME) {
+          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) {
             output.WriteRawTag(16);
             output.WriteEnum((int) Type);
           }
@@ -352,7 +352,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
           if (Number.Length != 0) {
             size += 1 + pb::CodedOutputStream.ComputeStringSize(Number);
           }
-          if (Type != global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType.HOME) {
+          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) {
             size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
           }
           return size;
@@ -365,7 +365,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
           if (other.Number.Length != 0) {
             Number = other.Number;
           }
-          if (other.Type != global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType.HOME) {
+          if (other.Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) {
             Type = other.Type;
           }
         }
@@ -386,7 +386,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
                 break;
               }
               case 16: {
-                type_ = (global::Google.ProtocolBuffers.Examples.AddressBook.Person.Types.PhoneType) input.ReadEnum();
+                type_ = (global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) input.ReadEnum();
                 break;
               }
             }
@@ -408,11 +408,11 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     private static readonly string[] _fieldNames = new string[] { "person" };
     private static readonly uint[] _fieldTags = new uint[] { 10 };
     public static pbd::MessageDescriptor Descriptor {
-      get { return global::Google.ProtocolBuffers.Examples.AddressBook.Addressbook.internal__static_tutorial_AddressBook__Descriptor; }
+      get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_AddressBook__Descriptor; }
     }
 
     public pb::FieldAccess.FieldAccessorTable<AddressBook> Fields {
-      get { return global::Google.ProtocolBuffers.Examples.AddressBook.Addressbook.internal__static_tutorial_AddressBook__FieldAccessorTable; }
+      get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.internal__static_tutorial_AddressBook__FieldAccessorTable; }
     }
 
     private bool _frozen = false;
@@ -437,8 +437,8 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     }
 
     public const int PersonFieldNumber = 1;
-    private readonly pbc::RepeatedField<global::Google.ProtocolBuffers.Examples.AddressBook.Person> person_ = new pbc::RepeatedField<global::Google.ProtocolBuffers.Examples.AddressBook.Person>();
-    public pbc::RepeatedField<global::Google.ProtocolBuffers.Examples.AddressBook.Person> Person {
+    private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> person_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person>();
+    public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> Person {
       get { return person_; }
     }
 
@@ -472,7 +472,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
     public int CalculateSize() {
       int size = 0;
       if (person_.Count > 0) {
-        foreach (global::Google.ProtocolBuffers.Examples.AddressBook.Person element in person_) {
+        foreach (global::Google.Protobuf.Examples.AddressBook.Person element in person_) {
           size += pb::CodedOutputStream.ComputeMessageSize(element);
         }
         size += 1 * person_.Count;
@@ -499,7 +499,7 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
             }
             break;
           case 10: {
-            input.ReadMessageArray(person_, global::Google.ProtocolBuffers.Examples.AddressBook.Person.Parser);
+            input.ReadMessageArray(person_, global::Google.Protobuf.Examples.AddressBook.Person.Parser);
             break;
           }
         }

csharp/src/AddressBook/ListPeople.cs

@@ -37,7 +37,7 @@
 using System;
 using System.IO;
 
-namespace Google.ProtocolBuffers.Examples.AddressBook
+namespace Google.Protobuf.Examples.AddressBook
 {
     internal class ListPeople
     {

csharp/src/AddressBook/Program.cs

@@ -36,7 +36,7 @@
 
 using System;
 
-namespace Google.ProtocolBuffers.Examples.AddressBook
+namespace Google.Protobuf.Examples.AddressBook
 {
     /// <summary>
     /// Entry point. Repeatedly prompts user for an action to take, delegating actual behaviour

csharp/src/AddressBook/SampleUsage.cs

@@ -1,8 +1,7 @@
-using Google.Protobuf;
-using System;
+using System;
 using System.IO;
 
-namespace Google.ProtocolBuffers.Examples.AddressBook
+namespace Google.Protobuf.Examples.AddressBook
 {
     internal class SampleUsage
     {

csharp/src/ProtoDump/Program.cs

@@ -36,9 +36,8 @@
 
 using System;
 using System.IO;
-using Google.Protobuf;
 
-namespace Google.ProtocolBuffers.ProtoDump
+namespace Google.Protobuf.ProtoDump
 {
     /// <summary>
     /// Small utility to load a binary message and dump it in text form

csharp/src/ProtoDump/ProtoDump.csproj

@@ -10,7 +10,7 @@
     <ProjectGuid>{D7282E99-2DC3-405B-946F-177DB2FD2AE2}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Google.ProtocolBuffers.ProtoDump</RootNamespace>
+    <RootNamespace>Google.Protobuf.ProtoDump</RootNamespace>
     <AssemblyName>ProtoDump</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

csharp/src/ProtocolBuffers.Test/App.xaml

@@ -1,8 +0,0 @@
-<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-             x:Class="ProtocolBuffers.SilverlightTest.App"
-             >
-    <Application.Resources>
-        
-    </Application.Resources>
-</Application>

csharp/src/ProtocolBuffers.Test/App.xaml.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Windows;
-using Microsoft.Silverlight.Testing;
-
-namespace Google.ProtocolBuffers
-{
-    public partial class App : Application
-    {
-
-        public App()
-        {
-            this.Startup += this.Application_Startup;
-            this.Exit += this.Application_Exit;
-            this.UnhandledException += this.Application_UnhandledException;
-
-            //InitializeComponent();
-        }
-
-        private void Application_Startup(object sender, StartupEventArgs e)
-        {
-            this.RootVisual = UnitTestSystem.CreateTestPage();
-        }
-
-        private void Application_Exit(object sender, EventArgs e)
-        {
-
-        }
-        private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
-        {
-            // If the app is running outside of the debugger then report the exception using
-            // the browser's exception mechanism. On IE this will display it a yellow alert 
-            // icon in the status bar and Firefox will display a script error.
-            if (!System.Diagnostics.Debugger.IsAttached)
-            {
-
-                // NOTE: This will allow the application to continue running after an exception has been thrown
-                // but not handled. 
-                // For production applications this error handling should be replaced with something that will 
-                // report the error to the website and stop the application.
-                e.Handled = true;
-                Deployment.Current.Dispatcher.BeginInvoke(
-                    new EventHandler<ApplicationUnhandledExceptionEventArgs>(ReportErrorToDOM), 
-                    new object[] { sender, e } );
-            }
-        }
-        private void ReportErrorToDOM(object sender, ApplicationUnhandledExceptionEventArgs e)
-        {
-            try
-            {
-                string errorMsg = e.ExceptionObject.Message + e.ExceptionObject.StackTrace;
-                errorMsg = errorMsg.Replace('"', '\'').Replace("\r\n", @"\n");
-
-                System.Windows.Browser.HtmlPage.Window.Eval("throw new Error(\"Unhandled Error in Silverlight 2 Application " + errorMsg + "\");");
-            }
-            catch (Exception)
-            {
-            }
-        }
-    }
-}

csharp/testdata/text_format_unittest_data.txt

@@ -1,116 +0,0 @@
-optional_int32: 101
-optional_int64: 102
-optional_uint32: 103
-optional_uint64: 104
-optional_sint32: 105
-optional_sint64: 106
-optional_fixed32: 107
-optional_fixed64: 108
-optional_sfixed32: 109
-optional_sfixed64: 110
-optional_float: 111
-optional_double: 112
-optional_bool: true
-optional_string: "115"
-optional_bytes: "116"
-OptionalGroup {
-  a: 117
-}
-optional_nested_message {
-  bb: 118
-}
-optional_foreign_message {
-  c: 119
-}
-optional_import_message {
-  d: 120
-}
-optional_nested_enum: BAZ
-optional_foreign_enum: FOREIGN_BAZ
-optional_import_enum: IMPORT_BAZ
-optional_string_piece: "124"
-optional_cord: "125"
-repeated_int32: 201
-repeated_int32: 301
-repeated_int64: 202
-repeated_int64: 302
-repeated_uint32: 203
-repeated_uint32: 303
-repeated_uint64: 204
-repeated_uint64: 304
-repeated_sint32: 205
-repeated_sint32: 305
-repeated_sint64: 206
-repeated_sint64: 306
-repeated_fixed32: 207
-repeated_fixed32: 307
-repeated_fixed64: 208
-repeated_fixed64: 308
-repeated_sfixed32: 209
-repeated_sfixed32: 309
-repeated_sfixed64: 210
-repeated_sfixed64: 310
-repeated_float: 211
-repeated_float: 311
-repeated_double: 212
-repeated_double: 312
-repeated_bool: true
-repeated_bool: false
-repeated_string: "215"
-repeated_string: "315"
-repeated_bytes: "216"
-repeated_bytes: "316"
-RepeatedGroup {
-  a: 217
-}
-RepeatedGroup {
-  a: 317
-}
-repeated_nested_message {
-  bb: 218
-}
-repeated_nested_message {
-  bb: 318
-}
-repeated_foreign_message {
-  c: 219
-}
-repeated_foreign_message {
-  c: 319
-}
-repeated_import_message {
-  d: 220
-}
-repeated_import_message {
-  d: 320
-}
-repeated_nested_enum: BAR
-repeated_nested_enum: BAZ
-repeated_foreign_enum: FOREIGN_BAR
-repeated_foreign_enum: FOREIGN_BAZ
-repeated_import_enum: IMPORT_BAR
-repeated_import_enum: IMPORT_BAZ
-repeated_string_piece: "224"
-repeated_string_piece: "324"
-repeated_cord: "225"
-repeated_cord: "325"
-default_int32: 401
-default_int64: 402
-default_uint32: 403
-default_uint64: 404
-default_sint32: 405
-default_sint64: 406
-default_fixed32: 407
-default_fixed64: 408
-default_sfixed32: 409
-default_sfixed64: 410
-default_float: 411
-default_double: 412
-default_bool: false
-default_string: "415"
-default_bytes: "416"
-default_nested_enum: FOO
-default_foreign_enum: FOREIGN_FOO
-default_import_enum: IMPORT_FOO
-default_string_piece: "424"
-default_cord: "425"

csharp/testdata/text_format_unittest_extensions_data.txt

@@ -1,116 +0,0 @@
-[protobuf_unittest.optional_int32_extension]: 101
-[protobuf_unittest.optional_int64_extension]: 102
-[protobuf_unittest.optional_uint32_extension]: 103
-[protobuf_unittest.optional_uint64_extension]: 104
-[protobuf_unittest.optional_sint32_extension]: 105
-[protobuf_unittest.optional_sint64_extension]: 106
-[protobuf_unittest.optional_fixed32_extension]: 107
-[protobuf_unittest.optional_fixed64_extension]: 108
-[protobuf_unittest.optional_sfixed32_extension]: 109
-[protobuf_unittest.optional_sfixed64_extension]: 110
-[protobuf_unittest.optional_float_extension]: 111
-[protobuf_unittest.optional_double_extension]: 112
-[protobuf_unittest.optional_bool_extension]: true
-[protobuf_unittest.optional_string_extension]: "115"
-[protobuf_unittest.optional_bytes_extension]: "116"
-[protobuf_unittest.optionalgroup_extension] {
-  a: 117
-}
-[protobuf_unittest.optional_nested_message_extension] {
-  bb: 118
-}
-[protobuf_unittest.optional_foreign_message_extension] {
-  c: 119
-}
-[protobuf_unittest.optional_import_message_extension] {
-  d: 120
-}
-[protobuf_unittest.optional_nested_enum_extension]: BAZ
-[protobuf_unittest.optional_foreign_enum_extension]: FOREIGN_BAZ
-[protobuf_unittest.optional_import_enum_extension]: IMPORT_BAZ
-[protobuf_unittest.optional_string_piece_extension]: "124"
-[protobuf_unittest.optional_cord_extension]: "125"
-[protobuf_unittest.repeated_int32_extension]: 201
-[protobuf_unittest.repeated_int32_extension]: 301
-[protobuf_unittest.repeated_int64_extension]: 202
-[protobuf_unittest.repeated_int64_extension]: 302
-[protobuf_unittest.repeated_uint32_extension]: 203
-[protobuf_unittest.repeated_uint32_extension]: 303
-[protobuf_unittest.repeated_uint64_extension]: 204
-[protobuf_unittest.repeated_uint64_extension]: 304
-[protobuf_unittest.repeated_sint32_extension]: 205
-[protobuf_unittest.repeated_sint32_extension]: 305
-[protobuf_unittest.repeated_sint64_extension]: 206
-[protobuf_unittest.repeated_sint64_extension]: 306
-[protobuf_unittest.repeated_fixed32_extension]: 207
-[protobuf_unittest.repeated_fixed32_extension]: 307
-[protobuf_unittest.repeated_fixed64_extension]: 208
-[protobuf_unittest.repeated_fixed64_extension]: 308
-[protobuf_unittest.repeated_sfixed32_extension]: 209
-[protobuf_unittest.repeated_sfixed32_extension]: 309
-[protobuf_unittest.repeated_sfixed64_extension]: 210
-[protobuf_unittest.repeated_sfixed64_extension]: 310
-[protobuf_unittest.repeated_float_extension]: 211
-[protobuf_unittest.repeated_float_extension]: 311
-[protobuf_unittest.repeated_double_extension]: 212
-[protobuf_unittest.repeated_double_extension]: 312
-[protobuf_unittest.repeated_bool_extension]: true
-[protobuf_unittest.repeated_bool_extension]: false
-[protobuf_unittest.repeated_string_extension]: "215"
-[protobuf_unittest.repeated_string_extension]: "315"
-[protobuf_unittest.repeated_bytes_extension]: "216"
-[protobuf_unittest.repeated_bytes_extension]: "316"
-[protobuf_unittest.repeatedgroup_extension] {
-  a: 217
-}
-[protobuf_unittest.repeatedgroup_extension] {
-  a: 317
-}
-[protobuf_unittest.repeated_nested_message_extension] {
-  bb: 218
-}
-[protobuf_unittest.repeated_nested_message_extension] {
-  bb: 318
-}
-[protobuf_unittest.repeated_foreign_message_extension] {
-  c: 219
-}
-[protobuf_unittest.repeated_foreign_message_extension] {
-  c: 319
-}
-[protobuf_unittest.repeated_import_message_extension] {
-  d: 220
-}
-[protobuf_unittest.repeated_import_message_extension] {
-  d: 320
-}
-[protobuf_unittest.repeated_nested_enum_extension]: BAR
-[protobuf_unittest.repeated_nested_enum_extension]: BAZ
-[protobuf_unittest.repeated_foreign_enum_extension]: FOREIGN_BAR
-[protobuf_unittest.repeated_foreign_enum_extension]: FOREIGN_BAZ
-[protobuf_unittest.repeated_import_enum_extension]: IMPORT_BAR
-[protobuf_unittest.repeated_import_enum_extension]: IMPORT_BAZ
-[protobuf_unittest.repeated_string_piece_extension]: "224"
-[protobuf_unittest.repeated_string_piece_extension]: "324"
-[protobuf_unittest.repeated_cord_extension]: "225"
-[protobuf_unittest.repeated_cord_extension]: "325"
-[protobuf_unittest.default_int32_extension]: 401
-[protobuf_unittest.default_int64_extension]: 402
-[protobuf_unittest.default_uint32_extension]: 403
-[protobuf_unittest.default_uint64_extension]: 404
-[protobuf_unittest.default_sint32_extension]: 405
-[protobuf_unittest.default_sint64_extension]: 406
-[protobuf_unittest.default_fixed32_extension]: 407
-[protobuf_unittest.default_fixed64_extension]: 408
-[protobuf_unittest.default_sfixed32_extension]: 409
-[protobuf_unittest.default_sfixed64_extension]: 410
-[protobuf_unittest.default_float_extension]: 411
-[protobuf_unittest.default_double_extension]: 412
-[protobuf_unittest.default_bool_extension]: false
-[protobuf_unittest.default_string_extension]: "415"
-[protobuf_unittest.default_bytes_extension]: "416"
-[protobuf_unittest.default_nested_enum_extension]: FOO
-[protobuf_unittest.default_foreign_enum_extension]: FOREIGN_FOO
-[protobuf_unittest.default_import_enum_extension]: IMPORT_FOO
-[protobuf_unittest.default_string_piece_extension]: "424"
-[protobuf_unittest.default_cord_extension]: "425"

examples/addressbook.proto

@@ -6,7 +6,7 @@ package tutorial;
 
 option java_package = "com.example.tutorial";
 option java_outer_classname = "AddressBookProtos";
-option csharp_namespace = "Google.ProtocolBuffers.Examples.AddressBook";
+option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
 
 message Person {
   required string name = 1;

src/google/protobuf/any.proto

@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "AnyProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 

src/google/protobuf/duration.proto

@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "DurationProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 // A Duration represents a signed, fixed-length span of time represented

src/google/protobuf/field_mask.proto

@@ -34,7 +34,7 @@ package google.protobuf;
 option java_multiple_files = true;
 option java_outer_classname = "FieldMaskProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 

src/google/protobuf/map_lite_unittest.proto

@@ -32,7 +32,6 @@ syntax = "proto2";
 
 option cc_enable_arenas = true;
 option optimize_for = LITE_RUNTIME;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import "google/protobuf/unittest_lite.proto";
 

src/google/protobuf/map_proto2_unittest.proto

@@ -36,8 +36,6 @@ syntax = "proto2";
 // In map_test_util.h we do "using namespace unittest = protobuf_unittest".
 package protobuf_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 enum Proto2MapEnum {
   PROTO2_MAP_ENUM_FOO   = 0;
   PROTO2_MAP_ENUM_BAR   = 1;

src/google/protobuf/map_unittest.proto

@@ -31,7 +31,6 @@
 syntax = "proto3";
 
 option cc_enable_arenas = true;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import "google/protobuf/unittest.proto";
 

src/google/protobuf/struct.proto

@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "StructProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 

src/google/protobuf/timestamp.proto

@@ -35,7 +35,7 @@ option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "TimestampProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";
 
 

src/google/protobuf/unittest.proto

@@ -42,7 +42,6 @@ option cc_generic_services = true;     // auto-added
 option java_generic_services = true;   // auto-added
 option py_generic_services = true;     // auto-added
 option cc_enable_arenas = true;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import "google/protobuf/unittest_import.proto";
 

src/google/protobuf/unittest_custom_options.proto

@@ -41,7 +41,6 @@ syntax = "proto2";
 option cc_generic_services = true;     // auto-added
 option java_generic_services = true;   // auto-added
 option py_generic_services = true;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // A custom file option (defined below).
 option (file_opt1) = 9876543210;

src/google/protobuf/unittest_drop_unknown_fields.proto

@@ -33,7 +33,7 @@ syntax = "proto3";
 package unittest_drop_unknown_fields;
 option objc_class_prefix = "DropUnknowns";
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
+option csharp_namespace = "Google.Protobuf.TestProtos";
 
 message Foo {
   enum NestedEnum {

src/google/protobuf/unittest_embed_optimize_for.proto

@@ -39,8 +39,6 @@ import "google/protobuf/unittest_optimize_for.proto";
 
 package protobuf_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 // We optimize for speed here, but we are importing a proto that is optimized
 // for code size.
 option optimize_for = SPEED;

src/google/protobuf/unittest_enormous_descriptor.proto

@@ -40,7 +40,6 @@ syntax = "proto2";
 
 package google.protobuf;
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // Avoid generating insanely long methods.
 option optimize_for = CODE_SIZE;

src/google/protobuf/unittest_import.proto

@@ -47,7 +47,6 @@ option cc_enable_arenas = true;
 
 // Exercise the java_package option.
 option java_package = "com.google.protobuf.test";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // Do not set a java_outer_classname here to verify that Proto2 works without
 // one.

src/google/protobuf/unittest_import_lite.proto

@@ -38,7 +38,6 @@ package protobuf_unittest_import;
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 import public "google/protobuf/unittest_import_public_lite.proto";
 

src/google/protobuf/unittest_import_public.proto

@@ -35,7 +35,6 @@ syntax = "proto2";
 package protobuf_unittest_import;
 
 option java_package = "com.google.protobuf.test";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message PublicImportMessage {
   optional int32 e = 1;

src/google/protobuf/unittest_import_public_lite.proto

@@ -37,7 +37,6 @@ package protobuf_unittest_import;
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message PublicImportMessageLite {
   optional int32 e = 1;

src/google/protobuf/unittest_lite.proto

@@ -40,7 +40,6 @@ import "google/protobuf/unittest_import_lite.proto";
 option optimize_for = LITE_RUNTIME;
 
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // Same as TestAllTypes but with the lite runtime.
 message TestAllTypesLite {

src/google/protobuf/unittest_lite_imports_nonlite.proto

@@ -38,7 +38,6 @@ package protobuf_unittest;
 import "google/protobuf/unittest.proto";
 
 option optimize_for = LITE_RUNTIME;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message TestLiteImportsNonlite {
   optional TestAllTypes message = 1;

src/google/protobuf/unittest_mset.proto

@@ -39,7 +39,6 @@ package protobuf_unittest;
 
 option cc_enable_arenas = true;
 option optimize_for = SPEED;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 // A message with message_set_wire_format.
 message TestMessageSet {

src/google/protobuf/unittest_no_field_presence.proto

@@ -37,8 +37,6 @@ import "google/protobuf/unittest.proto";
 
 package proto2_nofieldpresence_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos.Proto3";
-
 // This proto includes every type of field in both singular and repeated
 // forms.
 message TestAllTypes {

src/google/protobuf/unittest_optimize_for.proto

@@ -40,7 +40,6 @@ import "google/protobuf/unittest.proto";
 package protobuf_unittest;
 
 option optimize_for = CODE_SIZE;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
 
 message TestOptimizedForSize {
   optional int32 i = 1;

src/google/protobuf/unittest_preserve_unknown_enum.proto

@@ -33,7 +33,7 @@ syntax = "proto3";
 package proto3_preserve_unknown_enum_unittest;
 option objc_class_prefix = "UnknownEnums";
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
+option csharp_namespace = "Google.Protobuf.TestProtos";
 
 enum MyEnum {
   FOO = 0;

src/google/protobuf/unittest_preserve_unknown_enum2.proto

@@ -32,8 +32,6 @@ syntax = "proto2";
 
 package proto2_preserve_unknown_enum_unittest;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 enum MyEnum {
   FOO = 0;
   BAR = 1;

src/google/protobuf/unknown_enum_test.proto

@@ -36,8 +36,6 @@ syntax = "proto2";
 
 package google.protobuf.util;
 
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
 message DownRevision {
   enum Enum {
     DEFAULT_VALUE = 2;

src/google/protobuf/wrappers.proto

@@ -40,7 +40,7 @@ package google.protobuf;
 option java_multiple_files = true;
 option java_outer_classname = "WrappersProto";
 option java_package = "com.google.protobuf";
-option csharp_namespace = "Google.ProtocolBuffers";
+option csharp_namespace = "Google.Protobuf";
 option objc_class_prefix = "GPB";