Skip to content

P
protobuf
Commit 4e354c70 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files
Options

Merge pull request #616 from jskeet/rename 

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