From 57cc83e20305a775d5d709d9af98f52d42284cd0 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 Nov 2016 19:34:06 +0100 Subject: Update .csproj files to System.Interactive.Async to 3.1.1 --- src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj | 6 +++--- src/csharp/Grpc.Core.Tests/packages.config | 6 +++--- src/csharp/Grpc.Core/Grpc.Core.csproj | 2 +- src/csharp/Grpc.Core/packages.config | 2 +- src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj | 6 +++--- src/csharp/Grpc.Examples.Tests/packages.config | 2 +- src/csharp/Grpc.Examples/Grpc.Examples.csproj | 7 +++---- src/csharp/Grpc.Examples/packages.config | 2 +- src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj | 7 +++---- src/csharp/Grpc.HealthCheck/packages.config | 2 +- src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj | 6 +++--- src/csharp/Grpc.IntegrationTesting/packages.config | 2 +- 12 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj index d99bf8e4e1..19a68ab9ea 100644 --- a/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj +++ b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj @@ -39,15 +39,15 @@ ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll - - ..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll - ..\packages\NUnitLite.3.2.0\lib\net45\nunitlite.dll ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll + diff --git a/src/csharp/Grpc.Core.Tests/packages.config b/src/csharp/Grpc.Core.Tests/packages.config index 456ffcd8d0..4750735fad 100644 --- a/src/csharp/Grpc.Core.Tests/packages.config +++ b/src/csharp/Grpc.Core.Tests/packages.config @@ -1,10 +1,10 @@  - - + - + + \ No newline at end of file diff --git a/src/csharp/Grpc.Core/Grpc.Core.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj index d315e6d667..b9715183d0 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.csproj +++ b/src/csharp/Grpc.Core/Grpc.Core.csproj @@ -40,7 +40,7 @@ - ..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll + ..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll diff --git a/src/csharp/Grpc.Core/packages.config b/src/csharp/Grpc.Core/packages.config index 6514774021..53cfad52f0 100644 --- a/src/csharp/Grpc.Core/packages.config +++ b/src/csharp/Grpc.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj index a114d96127..16d7a44f92 100644 --- a/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj +++ b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj @@ -39,15 +39,15 @@ ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll - - ..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll - ..\packages\NUnitLite.3.2.0\lib\net45\nunitlite.dll ..\packages\Google.Protobuf.3.0.0\lib\net45\Google.Protobuf.dll + + ..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll + diff --git a/src/csharp/Grpc.Examples.Tests/packages.config b/src/csharp/Grpc.Examples.Tests/packages.config index f14517d2e2..0fed4dbd41 100644 --- a/src/csharp/Grpc.Examples.Tests/packages.config +++ b/src/csharp/Grpc.Examples.Tests/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/src/csharp/Grpc.Examples/Grpc.Examples.csproj b/src/csharp/Grpc.Examples/Grpc.Examples.csproj index dcbef5fc0b..c1ea2e2833 100644 --- a/src/csharp/Grpc.Examples/Grpc.Examples.csproj +++ b/src/csharp/Grpc.Examples/Grpc.Examples.csproj @@ -42,13 +42,12 @@ - - False - ..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll - ..\packages\Google.Protobuf.3.0.0\lib\net45\Google.Protobuf.dll + + ..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll + diff --git a/src/csharp/Grpc.Examples/packages.config b/src/csharp/Grpc.Examples/packages.config index d17347f08f..c7db26bd64 100644 --- a/src/csharp/Grpc.Examples/packages.config +++ b/src/csharp/Grpc.Examples/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj index 54a2984964..c8b6d478b7 100644 --- a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj +++ b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.csproj @@ -40,10 +40,6 @@ - - False - ..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll - @@ -52,6 +48,9 @@ ..\packages\Google.Protobuf.3.0.0\lib\net45\Google.Protobuf.dll + + ..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll + diff --git a/src/csharp/Grpc.HealthCheck/packages.config b/src/csharp/Grpc.HealthCheck/packages.config index f8e353bf26..5ab40b7a8c 100644 --- a/src/csharp/Grpc.HealthCheck/packages.config +++ b/src/csharp/Grpc.HealthCheck/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj index afd85fb484..161b015300 100644 --- a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj +++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj @@ -51,9 +51,6 @@ ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll - - ..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll - ..\packages\NUnitLite.3.2.0\lib\net45\nunitlite.dll @@ -90,6 +87,9 @@ ..\packages\Moq.4.6.38-alpha\lib\net45\Moq.dll + + ..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll + diff --git a/src/csharp/Grpc.IntegrationTesting/packages.config b/src/csharp/Grpc.IntegrationTesting/packages.config index a39fb3a23e..a03ee926f4 100644 --- a/src/csharp/Grpc.IntegrationTesting/packages.config +++ b/src/csharp/Grpc.IntegrationTesting/packages.config @@ -12,6 +12,6 @@ - + \ No newline at end of file -- cgit v1.2.3 From f8c43a0b34cbe34954469c294c7f55d8574160da Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 Nov 2016 19:38:52 +0100 Subject: update project.json projects to System.Interactive.Async 3.1.1 --- src/csharp/Grpc.Core/project.json | 2 +- templates/src/csharp/Grpc.Core/project.json.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/csharp/Grpc.Core/project.json b/src/csharp/Grpc.Core/project.json index aa1e4cc7fb..80f59b2af6 100644 --- a/src/csharp/Grpc.Core/project.json +++ b/src/csharp/Grpc.Core/project.json @@ -31,7 +31,7 @@ "xmlDoc": true }, "dependencies": { - "System.Interactive.Async": "3.0.0" + "System.Interactive.Async": "3.1.1" }, "frameworks": { "net45": { }, diff --git a/templates/src/csharp/Grpc.Core/project.json.template b/templates/src/csharp/Grpc.Core/project.json.template index fcbef536c6..f8d3cf490b 100644 --- a/templates/src/csharp/Grpc.Core/project.json.template +++ b/templates/src/csharp/Grpc.Core/project.json.template @@ -33,7 +33,7 @@ "xmlDoc": true }, "dependencies": { - "System.Interactive.Async": "3.0.0" + "System.Interactive.Async": "3.1.1" }, "frameworks": { "net45": { }, -- cgit v1.2.3 From 63cdea3cf08899a8ffcc1a491dad35018409d2b0 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 Nov 2016 22:08:22 +0100 Subject: update Grpc.Core.nuspec --- src/csharp/Grpc.Core/Grpc.Core.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/csharp/Grpc.Core/Grpc.Core.nuspec b/src/csharp/Grpc.Core/Grpc.Core.nuspec index a8459c4d9c..b2a0160147 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.nuspec +++ b/src/csharp/Grpc.Core/Grpc.Core.nuspec @@ -15,7 +15,7 @@ Copyright 2015, Google Inc. gRPC RPC Protocol HTTP/2 - + -- cgit v1.2.3 From e7099c88352813188d8fb20ec24dd3992c75f2c4 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 Nov 2016 22:29:08 +0100 Subject: update Grpc.HealthCheck.nuspec --- src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.nuspec b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.nuspec index 4ffd18ccb2..f2e36ba2be 100644 --- a/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.nuspec +++ b/src/csharp/Grpc.HealthCheck/Grpc.HealthCheck.nuspec @@ -16,7 +16,7 @@ - + -- cgit v1.2.3