Merge pull request grpc#968 from jtattermusch/csharp_refactoring

C# refactoring and code cleanup
hfutxrl2011 · Mar 6, 2015 · 4947638 · 4947638
2 parents ee092fc + 13cd125
commit 4947638
Show file tree

Hide file tree

Showing 19 changed files with 1,137 additions and 696 deletions.
diff --git a/src/csharp/.gitignore b/src/csharp/.gitignore
@@ -1,4 +1,5 @@
 *.userprefs
+StyleCop.Cache
 test-results
 packages
 Grpc.v12.suo

diff --git a/src/csharp/Grpc.Core.Tests/PInvokeTest.cs b/src/csharp/Grpc.Core.Tests/PInvokeTest.cs
@@ -127,8 +127,6 @@ public void NewNativeCallbackBenchmark()
         [Test]
         public void NopPInvokeBenchmark()
         {
-            CompletionCallbackDelegate handler = Handler;
-
             BenchmarkUtil.RunBenchmark(
                 1000000, 100000000,
                 () => {

diff --git a/src/csharp/Grpc.Core/ChannelArgs.cs b/src/csharp/Grpc.Core/ChannelArgs.cs
@@ -99,7 +99,7 @@ internal ChannelArgsSafeHandle ToNativeChannelArgs()
                 }
                 return nativeArgs;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 if (nativeArgs != null)
                 {

diff --git a/src/csharp/Grpc.Core/Grpc.Core.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj
@@ -51,7 +51,6 @@
     <Compile Include="Internal\SafeHandleZeroIsInvalid.cs" />
     <Compile Include="Internal\Timespec.cs" />
     <Compile Include="Internal\GrpcThreadPool.cs" />
-    <Compile Include="Internal\AsyncCall.cs" />
     <Compile Include="Internal\ServerSafeHandle.cs" />
     <Compile Include="Method.cs" />
     <Compile Include="ServerCalls.cs" />
@@ -69,6 +68,12 @@
     <Compile Include="Credentials.cs" />
     <Compile Include="Internal\ChannelArgsSafeHandle.cs" />
     <Compile Include="ChannelArgs.cs" />
+    <Compile Include="Internal\AsyncCompletion.cs" />
+    <Compile Include="Internal\AsyncCallBase.cs" />
+    <Compile Include="Internal\AsyncCallServer.cs" />
+    <Compile Include="OperationFailedException.cs" />
+    <Compile Include="Internal\AsyncCall.cs" />
+    <Compile Include="Utils\Preconditions.cs" />
   </ItemGroup>
   <Choose>
     <!-- Under older versions of Monodevelop, Choose is not supported and is just