From 38b519a48dae92ea4e91036e5347d2f3d2c0a396 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 27 Jan 2016 18:32:42 -0800
Subject: replace nuget version by placeholder

---
 test/distrib/csharp/DistribTest/DistribTest.csproj |  8 ++++----
 test/distrib/csharp/DistribTest/packages.config    |  8 ++++----
 test/distrib/csharp/NuGet.Config                   |  7 +++++++
 test/distrib/csharp/NuGet.config                   |  6 ------
 test/distrib/csharp/run_distrib_test.sh            | 16 ++++++++++++++++
 test/distrib/csharp/update_version.sh              |  0
 6 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 test/distrib/csharp/NuGet.Config
 delete mode 100644 test/distrib/csharp/NuGet.config
 create mode 100755 test/distrib/csharp/run_distrib_test.sh
 mode change 100644 => 100755 test/distrib/csharp/update_version.sh

(limited to 'test/distrib/csharp')

diff --git a/test/distrib/csharp/DistribTest/DistribTest.csproj b/test/distrib/csharp/DistribTest/DistribTest.csproj
index a843df1664..124fc1bdf0 100644
--- a/test/distrib/csharp/DistribTest/DistribTest.csproj
+++ b/test/distrib/csharp/DistribTest/DistribTest.csproj
@@ -46,10 +46,10 @@
       <HintPath>..\packages\Google.Apis.Core.1.9.3\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Core.dll</HintPath>
     </Reference>
     <Reference Include="Grpc.Auth">
-      <HintPath>..\packages\Grpc.Auth.0.13.0\lib\net45\Grpc.Auth.dll</HintPath>
+      <HintPath>..\packages\Grpc.Auth.__GRPC_NUGET_VERSION__\lib\net45\Grpc.Auth.dll</HintPath>
     </Reference>
     <Reference Include="Grpc.Core">
-      <HintPath>..\packages\Grpc.Core.0.13.0\lib\net45\Grpc.Core.dll</HintPath>
+      <HintPath>..\packages\Grpc.Core.__GRPC_NUGET_VERSION__\lib\net45\Grpc.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks">
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -93,12 +93,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\grpc.native.csharp.0.13.0\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets" Condition="Exists('..\packages\grpc.native.csharp.0.13.0\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets')" />
+  <Import Project="..\packages\grpc.native.csharp.__GRPC_NUGET_VERSION__\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets" Condition="Exists('..\packages\grpc.native.csharp.__GRPC_NUGET_VERSION__\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\grpc.native.csharp.0.13.0\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\grpc.native.csharp.0.13.0\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets'))" />
+    <Error Condition="!Exists('..\packages\grpc.native.csharp.__GRPC_NUGET_VERSION__\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\grpc.native.csharp.__GRPC_NUGET_VERSION__\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
diff --git a/test/distrib/csharp/DistribTest/packages.config b/test/distrib/csharp/DistribTest/packages.config
index ab2fb33de6..aca09f600c 100644
--- a/test/distrib/csharp/DistribTest/packages.config
+++ b/test/distrib/csharp/DistribTest/packages.config
@@ -3,10 +3,10 @@
   <package id="BouncyCastle" version="1.7.0" targetFramework="net45" />
   <package id="Google.Apis.Auth" version="1.9.3" targetFramework="net45" />
   <package id="Google.Apis.Core" version="1.9.3" targetFramework="net45" />
-  <package id="Grpc" version="0.13.0" targetFramework="net45" />
-  <package id="Grpc.Auth" version="0.13.0" targetFramework="net45" />
-  <package id="Grpc.Core" version="0.13.0" targetFramework="net45" />
-  <package id="grpc.native.csharp" version="0.13.0" targetFramework="net45" />
+  <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="grpc.native.csharp" version="__GRPC_NUGET_VERSION__" targetFramework="net45" />
   <package id="Ix-Async" version="1.2.3" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
diff --git a/test/distrib/csharp/NuGet.Config b/test/distrib/csharp/NuGet.Config
new file mode 100644
index 0000000000..62b82684bc
--- /dev/null
+++ b/test/distrib/csharp/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="https://www.nuget.org/api/v2/" value="https://www.nuget.org/api/v2/" />
+    <add key="TestNugetFeed" value="TestNugetFeed" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/test/distrib/csharp/NuGet.config b/test/distrib/csharp/NuGet.config
deleted file mode 100644
index 5c48bcc925..0000000000
--- a/test/distrib/csharp/NuGet.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="TestNugetFeed" value="TestNugetFeed" />
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/test/distrib/csharp/run_distrib_test.sh b/test/distrib/csharp/run_distrib_test.sh
new file mode 100755
index 0000000000..802dc8c180
--- /dev/null
+++ b/test/distrib/csharp/run_distrib_test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -ex
+
+cd $(dirname $0)
+
+unzip "$EXTERNAL_GIT_ROOT/input_artifacts/csharp_nugets.zip" -d TestNugetFeed
+
+# TODO(jtattermusch): replace the version number
+./update_version.sh 0.13.0
+
+nuget restore
+
+xbuild DistribTest.sln
+
+mono DistribTest/bin/Debug/DistribTest.exe
diff --git a/test/distrib/csharp/update_version.sh b/test/distrib/csharp/update_version.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3