From 860f6d0820636bacc84414d921c9f80daff9211a Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 10 Feb 2015 08:29:51 -0800 Subject: started using nuget packages for dependencies --- src/csharp/.gitignore | 2 ++ src/csharp/GrpcApi/.gitignore | 1 + src/csharp/GrpcApi/GrpcApi.csproj | 28 ++++++++++++++------------ src/csharp/GrpcApi/packages.config | 11 ++++++++++ src/csharp/GrpcApiTests/.gitignore | 1 + src/csharp/GrpcApiTests/GrpcApiTests.csproj | 19 +++++++++++------ src/csharp/GrpcApiTests/packages.config | 5 +++++ src/csharp/GrpcCore/.gitignore | 1 + src/csharp/GrpcCoreTests/.gitignore | 1 + src/csharp/GrpcCoreTests/GrpcCoreTests.csproj | 14 +++++++++---- src/csharp/GrpcCoreTests/packages.config | 4 ++++ src/csharp/InteropClient/.gitignore | 1 + src/csharp/InteropClient/InteropClient.csproj | 16 +++++++++------ src/csharp/InteropClient/packages.config | 5 +++++ src/csharp/MathClient/.gitignore | 1 + src/csharp/lib/Google.ProtocolBuffers.dll | Bin 380416 -> 0 bytes 16 files changed, 81 insertions(+), 29 deletions(-) create mode 100644 src/csharp/GrpcApi/packages.config create mode 100644 src/csharp/GrpcApiTests/packages.config create mode 100644 src/csharp/GrpcCoreTests/packages.config create mode 100644 src/csharp/InteropClient/packages.config delete mode 100755 src/csharp/lib/Google.ProtocolBuffers.dll (limited to 'src/csharp') diff --git a/src/csharp/.gitignore b/src/csharp/.gitignore index dbf38f34b7..d35ff63f6e 100644 --- a/src/csharp/.gitignore +++ b/src/csharp/.gitignore @@ -1,2 +1,4 @@ *.userprefs test-results +packages +Grpc.v12.suo diff --git a/src/csharp/GrpcApi/.gitignore b/src/csharp/GrpcApi/.gitignore index 2cc8cca52d..4795a95b94 100644 --- a/src/csharp/GrpcApi/.gitignore +++ b/src/csharp/GrpcApi/.gitignore @@ -1,2 +1,3 @@ test-results bin +obj diff --git a/src/csharp/GrpcApi/GrpcApi.csproj b/src/csharp/GrpcApi/GrpcApi.csproj index f0f11de216..5a4ae67bd5 100644 --- a/src/csharp/GrpcApi/GrpcApi.csproj +++ b/src/csharp/GrpcApi/GrpcApi.csproj @@ -1,4 +1,4 @@ - + Debug @@ -30,19 +30,23 @@ false + + False + ..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll + - - False + + ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll - - - False + + ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll - - False + + + ..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll - - ..\lib\Google.ProtocolBuffers.dll + + ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll @@ -63,12 +67,10 @@ + - - - \ No newline at end of file diff --git a/src/csharp/GrpcApi/packages.config b/src/csharp/GrpcApi/packages.config new file mode 100644 index 0000000000..a6a949b3b3 --- /dev/null +++ b/src/csharp/GrpcApi/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/csharp/GrpcApiTests/.gitignore b/src/csharp/GrpcApiTests/.gitignore index 2cc8cca52d..4795a95b94 100644 --- a/src/csharp/GrpcApiTests/.gitignore +++ b/src/csharp/GrpcApiTests/.gitignore @@ -1,2 +1,3 @@ test-results bin +obj diff --git a/src/csharp/GrpcApiTests/GrpcApiTests.csproj b/src/csharp/GrpcApiTests/GrpcApiTests.csproj index d0aac2b753..cb955cff41 100644 --- a/src/csharp/GrpcApiTests/GrpcApiTests.csproj +++ b/src/csharp/GrpcApiTests/GrpcApiTests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -30,13 +30,14 @@ false - - - False + + False + ..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll - - ..\lib\Google.ProtocolBuffers.dll + + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + @@ -53,4 +54,10 @@ GrpcCore + + + + + + \ No newline at end of file diff --git a/src/csharp/GrpcApiTests/packages.config b/src/csharp/GrpcApiTests/packages.config new file mode 100644 index 0000000000..51c17bcd5e --- /dev/null +++ b/src/csharp/GrpcApiTests/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/csharp/GrpcCore/.gitignore b/src/csharp/GrpcCore/.gitignore index ba077a4031..8d4a6c08a8 100644 --- a/src/csharp/GrpcCore/.gitignore +++ b/src/csharp/GrpcCore/.gitignore @@ -1 +1,2 @@ bin +obj \ No newline at end of file diff --git a/src/csharp/GrpcCoreTests/.gitignore b/src/csharp/GrpcCoreTests/.gitignore index 2cc8cca52d..775a9440a2 100644 --- a/src/csharp/GrpcCoreTests/.gitignore +++ b/src/csharp/GrpcCoreTests/.gitignore @@ -1,2 +1,3 @@ test-results bin +obj \ No newline at end of file diff --git a/src/csharp/GrpcCoreTests/GrpcCoreTests.csproj b/src/csharp/GrpcCoreTests/GrpcCoreTests.csproj index 111f0883db..ca52cd8f40 100644 --- a/src/csharp/GrpcCoreTests/GrpcCoreTests.csproj +++ b/src/csharp/GrpcCoreTests/GrpcCoreTests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -30,10 +30,10 @@ false - - - False + + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + @@ -49,4 +49,10 @@ GrpcCore + + + + + + \ No newline at end of file diff --git a/src/csharp/GrpcCoreTests/packages.config b/src/csharp/GrpcCoreTests/packages.config new file mode 100644 index 0000000000..c714ef3a23 --- /dev/null +++ b/src/csharp/GrpcCoreTests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/csharp/InteropClient/.gitignore b/src/csharp/InteropClient/.gitignore index ba077a4031..8d4a6c08a8 100644 --- a/src/csharp/InteropClient/.gitignore +++ b/src/csharp/InteropClient/.gitignore @@ -1 +1,2 @@ bin +obj \ No newline at end of file diff --git a/src/csharp/InteropClient/InteropClient.csproj b/src/csharp/InteropClient/InteropClient.csproj index b8e099d785..a450f3a2fe 100644 --- a/src/csharp/InteropClient/InteropClient.csproj +++ b/src/csharp/InteropClient/InteropClient.csproj @@ -1,4 +1,4 @@ - + Debug @@ -33,13 +33,14 @@ x86 - - - False + + False + ..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll - - ..\lib\Google.ProtocolBuffers.dll + + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + @@ -56,4 +57,7 @@ GrpcApi + + + \ No newline at end of file diff --git a/src/csharp/InteropClient/packages.config b/src/csharp/InteropClient/packages.config new file mode 100644 index 0000000000..51c17bcd5e --- /dev/null +++ b/src/csharp/InteropClient/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/csharp/MathClient/.gitignore b/src/csharp/MathClient/.gitignore index ba077a4031..1746e3269e 100644 --- a/src/csharp/MathClient/.gitignore +++ b/src/csharp/MathClient/.gitignore @@ -1 +1,2 @@ bin +obj diff --git a/src/csharp/lib/Google.ProtocolBuffers.dll b/src/csharp/lib/Google.ProtocolBuffers.dll deleted file mode 100755 index ce2f466b24..0000000000 Binary files a/src/csharp/lib/Google.ProtocolBuffers.dll and /dev/null differ -- cgit v1.2.3 From f0ea718c98d06de82cff0c60bad3a539ffc4737a Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 10 Feb 2015 09:50:57 -0800 Subject: update readme file --- src/csharp/README.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/csharp') diff --git a/src/csharp/README.md b/src/csharp/README.md index 0df6925b39..a16f1e719e 100755 --- a/src/csharp/README.md +++ b/src/csharp/README.md @@ -15,8 +15,15 @@ EXPERIMENTAL ONLY completely rewritten. -INSTALLATION AND USAGE ----------------------- +INSTALLATION AND USAGE: WINDOWS +------------------------------- + +- Open Grpc.sln using Visual Studio 2013. NuGet dependencies will be restored + upon build. + + +INSTALLATION AND USAGE: LINUX & MONO +------------------------------------ - Compile and install the gRPC C Core library ``` @@ -31,6 +38,18 @@ sudo apt-get install monodevelop monodevelop-nunit sudo apt-get install nunit nunit-console ``` +- NuGet is used to manage project's dependencies. Prior opening Grpc.sln, + download dependencies using NuGet restore command: + +``` +# Import needed certicates into Mono certificate store: +mozroots --import --sync + +# Download NuGet.exe http://nuget.codeplex.com/releases/ +# Restore the nuget packages with Grpc C# dependencies +mono ~/Downloads/NuGet.exe restore Grpc.sln +``` + - Use MonoDevelop to open the solution Grpc.sln (you can also run unit tests from there). -- cgit v1.2.3