update zlib nuget packages

vsprojects/coapp/zlib/.gitignore

@@ -0,0 +1,5 @@
+*.nupkg
+/nuget.exe
+/Intermediate
+/Output
+

vsprojects/coapp/zlib/README.md

@@ -6,6 +6,7 @@ Uses [CoApp](http://coapp.org/) project to build the zlib 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)
 

vsprojects/coapp/zlib/buildall.bat

@@ -1,6 +1,30 @@
 @echo off
 setlocal
 
+REM setlocal
+REM call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
+REM call :build x64 Release v100 || goto :eof
+REM call :build x64 Debug v100 || goto :eof
+REM endlocal
+
+setlocal
+call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+call :build Win32 Release v100 || goto :eof
+call :build Win32 Debug v100 || goto :eof
+endlocal
+
+setlocal
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+call :build x64 Release v140 || goto :eof
+call :build x64 Debug v140 || goto :eof
+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
+
 setlocal
 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
 call :build x64 Release v120 || goto :eof
@@ -25,27 +49,15 @@ REM call :build Win32 Release v110 || goto :eof
 REM call :build Win32 Debug v110 || goto :eof
 REM endlocal
 
-REM setlocal
-REM call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
-REM call :build x64 Release v100 || goto :eof
-REM call :build x64 Debug v100 || goto :eof
-REM endlocal
-
-setlocal
-call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
-call :build Win32 Release v100 || goto :eof
-call :build Win32 Debug v100 || goto :eof
-endlocal
-
 goto :eof
 
 :build
-msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Dynamic /P:CallingConvention=cdecl .\zlib.sln || goto :eof
+msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Dynamic /P:CallingConvention=cdecl .\zlib.sln || goto :eof
-msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Dynamic /P:CallingConvention=stdcall .\zlib.sln || goto :eof
+msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Dynamic /P:CallingConvention=stdcall .\zlib.sln || goto :eof
-msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Static /P:CallingConvention=cdecl .\zlib.sln || goto :eof
+msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Static /P:CallingConvention=cdecl .\zlib.sln || goto :eof
-msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Static /P:CallingConvention=stdcall .\zlib.sln || goto :eof
+msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=Static /P:CallingConvention=stdcall .\zlib.sln || goto :eof
-msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=ltcg /P:CallingConvention=cdecl .\zlib.sln || goto :eof
+msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=ltcg /P:CallingConvention=cdecl .\zlib.sln || goto :eof
-msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=ltcg /P:CallingConvention=stdcall .\zlib.sln || goto :eof
+msbuild /m:4 /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:UsesConfigurationType=ltcg /P:CallingConvention=stdcall .\zlib.sln || goto :eof
 goto :eof
 
 

vsprojects/coapp/zlib/grpc.dependencies.zlib.autopkg

@@ -1,7 +1,14 @@
 @import @"version.inc";
 
-configurations {
+configurations
-};
+{
+    // See https://github.com/coapp/coapp.powershell/issues/112
+    Toolset
+    {
+        key : "PlatformToolset"; // this is CoApp pre-defined key
+        choices: { v140, v120, v110, v100 };
+    };
+}
 
 #define { 
       package-id = "grpc.dependencies.zlib";
@@ -36,7 +43,7 @@ nuget {
 		  #output {
               package = redist;
           };
-		  #destination = "\build\portable-net45";
+		  #destination = "\build\portable-net45+netcore45+wpa81+wp8";
 		  "managed_targets\${package-id}.redist.props";
 		  "managed_targets\${package-id}.redist.targets";
 		};
@@ -74,14 +81,14 @@ nuget {
             "..\..\..\third_party\zlib\zutil.h",
             "..\..\..\third_party\zlib\contrib\masmx64\inffas8664.c",
         };
-		("v100,v120", "Win32,x64", "Release,Debug", "Dynamic", "cdecl,stdcall", "MultiByte") => {
+		("v100,v120,v140", "Win32,x64", "Release,Debug", "Dynamic", "cdecl,stdcall", "MultiByte") => {
 			[${0},${1},${2},${3},${4}] {
 				lib:     { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.lib };
 				bin:     { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.dll };
 				symbols: { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.pdb };
 			};
 		};
-		("v100,v120", "Win32,x64", "Release,Debug", "Static,ltcg", "cdecl,stdcall", "MultiByte") => {
+		("v100,v120,v140", "Win32,x64", "Release,Debug", "Static,ltcg", "cdecl,stdcall", "MultiByte") => {
 			[${0},${1},${2},${3},${4}] {
 				lib:     { .\output\${0}\${1}\${2}\${3}\${4}\${5}\*.lib };
 			};

vsprojects/coapp/zlib/version.inc

@@ -1 +1 @@
-#define { package-version : 1.2.8.9; } 
+#define { package-version : 1.2.8.10; }