Merge pull request #7729 from apolcyn/update_to_sys_interactive

update to system interactive in distrib tests
9 years ago · 8006ed3d94
parent 1dfeee3487 03548cfef1
commit 8006ed3d94
9 changed files with 17 additions and 3 deletions
--- a/test/distrib/csharp/DistribTest/DistribTest.csproj
+++ b/test/distrib/csharp/DistribTest/DistribTest.csproj
@ -65,7 +65,7 @@
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Interactive.Async">
-      <HintPath>..\packages\Ix-Async.1.2.3\lib\net45\System.Interactive.Async.dll</HintPath>
+      <HintPath>..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath>
    </Reference>
    <Reference Include="System.Net" />
    <Reference Include="System.Net.Http" />
--- a/test/distrib/csharp/DistribTest/packages.config
+++ b/test/distrib/csharp/DistribTest/packages.config
@ -6,6 +6,6 @@
  <package id="Grpc" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
  <package id="Grpc.Auth" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
  <package id="Grpc.Core" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
-  <package id="Ix-Async" version="1.2.3" targetFramework="net45" />
+  <package id="System.Interactive.Async" version="3.0.0" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-</packages>
+</packages>
--- a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
@ -35,3 +35,5 @@ RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/
 RUN yum install -y mono
 RUN yum install -y unzip
 RUN yum install -y nuget
+
+RUN nuget update -self
--- a/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile
@ -40,4 +40,6 @@ RUN apt-get update && apt-get install -y \
    ca-certificates-mono \
    nuget

+RUN nuget update -self
+
 RUN apt-get update && apt-get install -y unzip
--- a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile
@ -40,4 +40,6 @@ RUN apt-get update && apt-get install -y \
    ca-certificates-mono \
    nuget

+RUN nuget update -self
+
 RUN apt-get update && apt-get install -y unzip
--- a/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
@ -37,4 +37,6 @@ RUN apt-get update && apt-get install -y \
    ca-certificates-mono \
    nuget

+RUN nuget update -self
+
 RUN apt-get update && apt-get install -y unzip
--- a/tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile
@ -37,4 +37,6 @@ RUN apt-get update && apt-get install -y \
    ca-certificates-mono \
    nuget

+RUN nuget update -self
+
 RUN apt-get update && apt-get install -y unzip
--- a/tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile
@ -37,4 +37,6 @@ RUN apt-get update && apt-get install -y \
    ca-certificates-mono \
    nuget

+RUN nuget update -self
+
 RUN apt-get update && apt-get install -y unzip
--- a/tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile
@ -34,4 +34,6 @@ RUN apt-get update && apt-get install -y \
    ca-certificates-mono \
    nuget

+RUN nuget update -self
+
 RUN apt-get update && apt-get install -y unzip