diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-11-30 14:48:28 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-12-01 08:53:50 -0800 |
| commit | 36065beee283e20ab566074750e0dc4410902332 (patch) | |
| tree | 6ba156a36a7b3b2192d0482c40c60a3e21bde76d /vsprojects | |
| parent | ef292c34e20083050410852b4d096e0516a40232 (diff) | |
grpc_csharp_ext VS2015 support
Diffstat (limited to 'vsprojects')
| -rw-r--r-- | vsprojects/nuget_package/README.md | 1 | ||||
| -rw-r--r-- | vsprojects/nuget_package/buildall.bat | 12 | ||||
| -rw-r--r-- | vsprojects/nuget_package/grpc.native.csharp.nuspec | 16 | ||||
| -rw-r--r-- | vsprojects/nuget_package/grpc.native.csharp.props | 2 |
4 files changed, 25 insertions, 6 deletions
diff --git a/vsprojects/nuget_package/README.md b/vsprojects/nuget_package/README.md index 9fcbb5f85d..58573f76d4 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 71befb6920..65aac3aa68 100644 --- a/vsprojects/nuget_package/buildall.bat +++ b/vsprojects/nuget_package/buildall.bat @@ -1,6 +1,18 @@ @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 REM call :build x64 Debug v120 || goto :eof diff --git a/vsprojects/nuget_package/grpc.native.csharp.nuspec b/vsprojects/nuget_package/grpc.native.csharp.nuspec index 50b56e9e6e..c151ae288a 100644 --- a/vsprojects/nuget_package/grpc.native.csharp.nuspec +++ b/vsprojects/nuget_package/grpc.native.csharp.nuspec @@ -15,16 +15,22 @@ <summary>Native library required by gRPC C#</summary> <tags>gRPC native</tags> <dependencies> - <dependency id="grpc.dependencies.zlib.redist" version="1.2.8.9" /> - <dependency id="grpc.dependencies.openssl.redist" version="1.0.2.3" /> + <dependency id="grpc.dependencies.zlib.redist" version="1.2.8.10" /> + <dependency id="grpc.dependencies.openssl.redist" version="1.0.204.1" /> </dependencies> </metadata> <files> - <file src="grpc.native.csharp.props" target="\build\portable-net45\grpc.native.csharp.props" /> - <file src="grpc.native.csharp.targets" target="\build\portable-net45\grpc.native.csharp.targets" /> + <file src="grpc.native.csharp.props" target="\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.props" /> + <file src="grpc.native.csharp.targets" target="\build\portable-net45+netcore45+wpa81+wp8\grpc.native.csharp.targets" /> + + <!-- VS 2010 --> <file src="output\v100\Win32\Release\grpc_csharp_ext.dll" target="/build/native/bin/v100\Win32\Release\grpc_csharp_ext.dll" /> - <file src="output\v120\Win32\Release\grpc_csharp_ext.dll" target="/build/native/bin/v120\Win32\Release\grpc_csharp_ext.dll" /> <file src="output\v100\Win32\Debug\grpc_csharp_ext.dll" target="/build/native/bin/v100\Win32\Debug\grpc_csharp_ext.dll" /> + <!-- VS 2013 --> <file src="output\v120\Win32\Debug\grpc_csharp_ext.dll" target="/build/native/bin/v120\Win32\Debug\grpc_csharp_ext.dll" /> + <file src="output\v120\Win32\Release\grpc_csharp_ext.dll" target="/build/native/bin/v120\Win32\Release\grpc_csharp_ext.dll" /> + <!-- VS 2015 --> + <file src="output\v140\Win32\Debug\grpc_csharp_ext.dll" target="/build/native/bin/v140\Win32\Debug\grpc_csharp_ext.dll" /> + <file src="output\v140\Win32\Release\grpc_csharp_ext.dll" target="/build/native/bin/v140\Win32\Release\grpc_csharp_ext.dll" /> </files> </package> diff --git a/vsprojects/nuget_package/grpc.native.csharp.props b/vsprojects/nuget_package/grpc.native.csharp.props index 63d23be3da..e8b1ab51da 100644 --- a/vsprojects/nuget_package/grpc.native.csharp.props +++ b/vsprojects/nuget_package/grpc.native.csharp.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <!-- Whether or not copy native dependencies to output directory after building --> + <!-- Whether or not to copy native dependencies to output directory after building --> <CopyNativeDependencies Condition=" '$(CopyNativeDependencies)' == '' ">true</CopyNativeDependencies> <!-- Set defaults for native dependencies if not already set. Properties can be overriden in the project files. --> |