From b12b8d0ddfce974226d1f33a71d2c45aa1b4cc0a Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 5 Dec 2017 19:31:49 +0100 Subject: [PATCH 1/6] cleanup helloworld for dotnet CLI --- .../csharp/helloworld-from-cli/Greeter/Greeter.csproj | 9 ++++----- .../GreeterClient/GreeterClient.csproj | 1 - .../GreeterServer/GreeterServer.csproj | 1 - examples/csharp/helloworld-from-cli/generate_protos.bat | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj b/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj index 6b26be1c9cd..3bff4a576bb 100644 --- a/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj +++ b/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj @@ -6,14 +6,13 @@ portable Greeter Greeter - 1.0.4 - - - - + + + + diff --git a/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj b/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj index 24cacfc0219..d1ed0404118 100644 --- a/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj +++ b/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj @@ -7,7 +7,6 @@ GreeterClient Exe GreeterClient - 1.0.4 diff --git a/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj b/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj index f7980fa7283..159fbd8a23d 100644 --- a/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj +++ b/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj @@ -7,7 +7,6 @@ GreeterServer Exe GreeterServer - 1.0.4 diff --git a/examples/csharp/helloworld-from-cli/generate_protos.bat b/examples/csharp/helloworld-from-cli/generate_protos.bat index e290be63c98..dcf60848f77 100644 --- a/examples/csharp/helloworld-from-cli/generate_protos.bat +++ b/examples/csharp/helloworld-from-cli/generate_protos.bat @@ -19,8 +19,8 @@ setlocal @rem enter this directory cd /d %~dp0 -set PROTOC=%UserProfile%\.nuget\packages\Google.Protobuf.Tools\3.2.0\tools\windows_x64\protoc.exe -set PLUGIN=%UserProfile%\.nuget\packages\Grpc.Tools\1.2.2\tools\windows_x64\grpc_csharp_plugin.exe +set PROTOC=%UserProfile%\.nuget\packages\Google.Protobuf.Tools\3.5.0\tools\windows_x64\protoc.exe +set PLUGIN=%UserProfile%\.nuget\packages\Grpc.Tools\1.8.0\tools\windows_x64\grpc_csharp_plugin.exe %PROTOC% -I../../protos --csharp_out Greeter ../../protos/helloworld.proto --grpc_out Greeter --plugin=protoc-gen-grpc=%PLUGIN% From a54c12d6cd09f62daad4f8f79eed97bab3dbac8c Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 Dec 2017 22:39:11 +0100 Subject: [PATCH 2/6] regenerate helloworld-from-cli protos --- examples/csharp/helloworld-from-cli/Greeter/HelloworldGrpc.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/csharp/helloworld-from-cli/Greeter/HelloworldGrpc.cs b/examples/csharp/helloworld-from-cli/Greeter/HelloworldGrpc.cs index 8168b287b4a..c808884e579 100644 --- a/examples/csharp/helloworld-from-cli/Greeter/HelloworldGrpc.cs +++ b/examples/csharp/helloworld-from-cli/Greeter/HelloworldGrpc.cs @@ -15,6 +15,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // +#pragma warning disable 1591 #region Designer generated code using System; From 2df1c24f1d9bfebc31e0caef2aaa5fe80f4315b5 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 Dec 2017 23:49:49 +0100 Subject: [PATCH 3/6] upgrade Grpc and Protobuf nugets in helloworld --- examples/csharp/helloworld/Greeter/Greeter.csproj | 10 +++++----- examples/csharp/helloworld/Greeter/packages.config | 8 ++++---- .../helloworld/GreeterClient/GreeterClient.csproj | 10 +++++----- .../csharp/helloworld/GreeterClient/packages.config | 6 +++--- .../helloworld/GreeterServer/GreeterServer.csproj | 10 +++++----- .../csharp/helloworld/GreeterServer/packages.config | 6 +++--- examples/csharp/helloworld/generate_protos.bat | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/csharp/helloworld/Greeter/Greeter.csproj b/examples/csharp/helloworld/Greeter/Greeter.csproj index 8dcd2d90666..d2597f13b5f 100644 --- a/examples/csharp/helloworld/Greeter/Greeter.csproj +++ b/examples/csharp/helloworld/Greeter/Greeter.csproj @@ -32,12 +32,12 @@ false - - ..\packages\Google.Protobuf.3.2.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.5.0\lib\net45\Google.Protobuf.dll True - ..\packages\Grpc.Core.1.2.2\lib\net45\Grpc.Core.dll + ..\packages\Grpc.Core.1.8.0\lib\net45\Grpc.Core.dll True @@ -62,11 +62,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/examples/csharp/helloworld/Greeter/packages.config b/examples/csharp/helloworld/Greeter/packages.config index ec83cd83002..38297f8d617 100644 --- a/examples/csharp/helloworld/Greeter/packages.config +++ b/examples/csharp/helloworld/Greeter/packages.config @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file diff --git a/examples/csharp/helloworld/GreeterClient/GreeterClient.csproj b/examples/csharp/helloworld/GreeterClient/GreeterClient.csproj index 4b6b1b3e12b..470749a2b2b 100644 --- a/examples/csharp/helloworld/GreeterClient/GreeterClient.csproj +++ b/examples/csharp/helloworld/GreeterClient/GreeterClient.csproj @@ -32,12 +32,12 @@ true - - ..\packages\Google.Protobuf.3.2.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.5.0\lib\net45\Google.Protobuf.dll True - ..\packages\Grpc.Core.1.2.2\lib\net45\Grpc.Core.dll + ..\packages\Grpc.Core.1.8.0\lib\net45\Grpc.Core.dll True @@ -60,11 +60,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/examples/csharp/helloworld/GreeterClient/packages.config b/examples/csharp/helloworld/GreeterClient/packages.config index b912fd49580..4b3684edfd3 100644 --- a/examples/csharp/helloworld/GreeterClient/packages.config +++ b/examples/csharp/helloworld/GreeterClient/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/examples/csharp/helloworld/GreeterServer/GreeterServer.csproj b/examples/csharp/helloworld/GreeterServer/GreeterServer.csproj index 97978fa7ace..82e2961cad2 100644 --- a/examples/csharp/helloworld/GreeterServer/GreeterServer.csproj +++ b/examples/csharp/helloworld/GreeterServer/GreeterServer.csproj @@ -32,12 +32,12 @@ true - - ..\packages\Google.Protobuf.3.2.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.5.0\lib\net45\Google.Protobuf.dll True - ..\packages\Grpc.Core.1.2.2\lib\net45\Grpc.Core.dll + ..\packages\Grpc.Core.1.8.0\lib\net45\Grpc.Core.dll True @@ -60,11 +60,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/examples/csharp/helloworld/GreeterServer/packages.config b/examples/csharp/helloworld/GreeterServer/packages.config index b912fd49580..4b3684edfd3 100644 --- a/examples/csharp/helloworld/GreeterServer/packages.config +++ b/examples/csharp/helloworld/GreeterServer/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/examples/csharp/helloworld/generate_protos.bat b/examples/csharp/helloworld/generate_protos.bat index f955470d66a..45b097e837e 100644 --- a/examples/csharp/helloworld/generate_protos.bat +++ b/examples/csharp/helloworld/generate_protos.bat @@ -19,7 +19,7 @@ setlocal @rem enter this directory cd /d %~dp0 -set TOOLS_PATH=packages\Grpc.Tools.1.2.2\tools\windows_x86 +set TOOLS_PATH=packages\Grpc.Tools.1.8.0\tools\windows_x86 %TOOLS_PATH%\protoc.exe -I../../protos --csharp_out Greeter ../../protos/helloworld.proto --grpc_out Greeter --plugin=protoc-gen-grpc=%TOOLS_PATH%\grpc_csharp_plugin.exe From 990299b48d5f00388fd257506c5ea36d00e239c4 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 Dec 2017 23:50:22 +0100 Subject: [PATCH 4/6] upgrade Grpc and Protobuf nugets in routeguide --- .../csharp/route_guide/RouteGuide/RouteGuide.csproj | 10 +++++----- examples/csharp/route_guide/RouteGuide/packages.config | 6 +++--- .../RouteGuideClient/RouteGuideClient.csproj | 10 +++++----- .../route_guide/RouteGuideClient/packages.config | 6 +++--- .../RouteGuideServer/RouteGuideServer.csproj | 10 +++++----- .../route_guide/RouteGuideServer/packages.config | 8 ++++---- examples/csharp/route_guide/generate_protos.bat | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/csharp/route_guide/RouteGuide/RouteGuide.csproj b/examples/csharp/route_guide/RouteGuide/RouteGuide.csproj index 360444e4918..e66e986f71f 100644 --- a/examples/csharp/route_guide/RouteGuide/RouteGuide.csproj +++ b/examples/csharp/route_guide/RouteGuide/RouteGuide.csproj @@ -32,12 +32,12 @@ 4 - - ..\packages\Google.Protobuf.3.2.0\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.5.0\lib\net45\Google.Protobuf.dll True - ..\packages\Grpc.Core.1.2.2\lib\net45\Grpc.Core.dll + ..\packages\Grpc.Core.1.8.0\lib\net45\Grpc.Core.dll True @@ -75,12 +75,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - +