aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/csharp/.gitignore2
-rw-r--r--src/csharp/GrpcApi/.gitignore1
-rw-r--r--src/csharp/GrpcApi/GrpcApi.csproj28
-rw-r--r--src/csharp/GrpcApi/packages.config11
-rw-r--r--src/csharp/GrpcApiTests/.gitignore1
-rw-r--r--src/csharp/GrpcApiTests/GrpcApiTests.csproj19
-rw-r--r--src/csharp/GrpcApiTests/packages.config5
-rw-r--r--src/csharp/GrpcCore/.gitignore1
-rw-r--r--src/csharp/GrpcCoreTests/.gitignore1
-rw-r--r--src/csharp/GrpcCoreTests/GrpcCoreTests.csproj14
-rw-r--r--src/csharp/GrpcCoreTests/packages.config4
-rw-r--r--src/csharp/InteropClient/.gitignore1
-rw-r--r--src/csharp/InteropClient/InteropClient.csproj16
-rw-r--r--src/csharp/InteropClient/packages.config5
-rw-r--r--src/csharp/MathClient/.gitignore1
-rwxr-xr-xsrc/csharp/README.md23
-rwxr-xr-xsrc/csharp/lib/Google.ProtocolBuffers.dllbin380416 -> 0 bytes
17 files changed, 102 insertions, 31 deletions
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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,19 +30,23 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Google.ProtocolBuffers, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
+ </Reference>
<Reference Include="System" />
- <Reference Include="System.Reactive.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <Private>False</Private>
+ <Reference Include="System.Reactive.Core">
+ <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
</Reference>
- <Reference Include="System.Data.Linq" />
- <Reference Include="System.Reactive.Interfaces, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <Private>False</Private>
+ <Reference Include="System.Reactive.Interfaces">
+ <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
- <Reference Include="System.Reactive.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <Private>False</Private>
+ <Reference Include="System.Data.Linq" />
+ <Reference Include="System.Reactive.Linq">
+ <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
</Reference>
- <Reference Include="Google.ProtocolBuffers">
- <HintPath>..\lib\Google.ProtocolBuffers.dll</HintPath>
+ <Reference Include="System.Reactive.PlatformServices">
+ <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -63,12 +67,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="proto\math.proto" />
<None Include="proto\empty.proto" />
<None Include="proto\messages.proto" />
<None Include="proto\test.proto" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="proto\" />
- </ItemGroup>
</Project> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
+ <package id="Ix-Main" version="1.2.3" targetFramework="net45" />
+ <package id="NUnit" version="2.6.4" targetFramework="net45" />
+ <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
+ <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
+ <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
+ <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
+ <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
+</packages> \ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,13 +30,14 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
- <Reference Include="System" />
- <Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
- <Private>False</Private>
+ <Reference Include="Google.ProtocolBuffers, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
</Reference>
- <Reference Include="Google.ProtocolBuffers">
- <HintPath>..\lib\Google.ProtocolBuffers.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -53,4 +54,10 @@
<Name>GrpcCore</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+ </ItemGroup>
</Project> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
+ <package id="NUnit" version="2.6.4" targetFramework="net45" />
+</packages> \ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,10 +30,10 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
- <Reference Include="System" />
- <Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
- <Private>False</Private>
+ <Reference Include="nunit.framework">
+ <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -49,4 +49,10 @@
<Name>GrpcCore</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+ </ItemGroup>
</Project> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NUnit" version="2.6.4" targetFramework="net45" />
+</packages> \ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,13 +33,14 @@
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
- <Reference Include="System" />
- <Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
- <Private>False</Private>
+ <Reference Include="Google.ProtocolBuffers, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath>
</Reference>
- <Reference Include="Google.ProtocolBuffers">
- <HintPath>..\lib\Google.ProtocolBuffers.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
+ <Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -56,4 +57,7 @@
<Name>GrpcApi</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
</Project> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
+ <package id="NUnit" version="2.6.4" targetFramework="net45" />
+</packages> \ 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/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).
diff --git a/src/csharp/lib/Google.ProtocolBuffers.dll b/src/csharp/lib/Google.ProtocolBuffers.dll
deleted file mode 100755
index ce2f466b24..0000000000
--- a/src/csharp/lib/Google.ProtocolBuffers.dll
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 07:45:24 +0000