diff --git a/build.yaml b/build.yaml index 82a023d2694..6345331915a 100644 --- a/build.yaml +++ b/build.yaml @@ -2266,11 +2266,11 @@ vspackages: name: grpc.dependencies.zlib props: false redist: true - version: 1.2.8.9 + version: 1.2.8.10 - name: grpc.dependencies.openssl props: true redist: true - version: 1.0.2.3 + version: 1.0.204.1 - name: gflags props: false redist: false diff --git a/vsprojects/nuget_package/README.md b/vsprojects/nuget_package/README.md index 9fcbb5f85df..58573f76d46 100644 --- a/vsprojects/nuget_package/README.md +++ b/vsprojects/nuget_package/README.md @@ -4,6 +4,7 @@ gRPC Native Nuget package Prerequisites ------------- Multiple versions of VS installed to be able to build all the targets: +* Visual Studio 2015 * Visual Studio 2013 * Visual Studio 2010 (you might need SP1 to prevent LNK1123 error) diff --git a/vsprojects/nuget_package/buildall.bat b/vsprojects/nuget_package/buildall.bat index 71befb69207..65aac3aa685 100644 --- a/vsprojects/nuget_package/buildall.bat +++ b/vsprojects/nuget_package/buildall.bat @@ -1,5 +1,17 @@ @echo off +REM setlocal +REM call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 +REM call :build x64 Release v140 || goto :eof +REM call :build x64 Debug v140 || goto :eof +REM endlocal + +setlocal +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +call :build Win32 Release v140 || goto :eof +call :build Win32 Debug v140 || goto :eof +endlocal + REM setlocal REM call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 REM call :build x64 Release v120 || goto :eof diff --git a/vsprojects/nuget_package/grpc.native.csharp.nuspec b/vsprojects/nuget_package/grpc.native.csharp.nuspec index 50b56e9e6e6..c151ae288a6 100644 --- a/vsprojects/nuget_package/grpc.native.csharp.nuspec +++ b/vsprojects/nuget_package/grpc.native.csharp.nuspec @@ -15,16 +15,22 @@ Native library required by gRPC C# gRPC native - - + + - - + + + + - + + + + + diff --git a/vsprojects/nuget_package/grpc.native.csharp.props b/vsprojects/nuget_package/grpc.native.csharp.props index 63d23be3dad..e8b1ab51da0 100644 --- a/vsprojects/nuget_package/grpc.native.csharp.props +++ b/vsprojects/nuget_package/grpc.native.csharp.props @@ -1,7 +1,7 @@  - + true