grpc_csharp_ext VS2015 support

pull/4236/head
Jan Tattermusch 9 years ago
parent ef292c34e2
commit 36065beee2
  1. 4
      build.yaml
  2. 1
      vsprojects/nuget_package/README.md
  3. 12
      vsprojects/nuget_package/buildall.bat
  4. 16
      vsprojects/nuget_package/grpc.native.csharp.nuspec
  5. 2
      vsprojects/nuget_package/grpc.native.csharp.props

@ -2266,11 +2266,11 @@ vspackages:
name: grpc.dependencies.zlib name: grpc.dependencies.zlib
props: false props: false
redist: true redist: true
version: 1.2.8.9 version: 1.2.8.10
- name: grpc.dependencies.openssl - name: grpc.dependencies.openssl
props: true props: true
redist: true redist: true
version: 1.0.2.3 version: 1.0.204.1
- name: gflags - name: gflags
props: false props: false
redist: false redist: false

@ -4,6 +4,7 @@ gRPC Native Nuget package
Prerequisites Prerequisites
------------- -------------
Multiple versions of VS installed to be able to build all the targets: Multiple versions of VS installed to be able to build all the targets:
* Visual Studio 2015
* Visual Studio 2013 * Visual Studio 2013
* Visual Studio 2010 (you might need SP1 to prevent LNK1123 error) * Visual Studio 2010 (you might need SP1 to prevent LNK1123 error)

@ -1,5 +1,17 @@
@echo off @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 setlocal
REM call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 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 Release v120 || goto :eof

@ -15,16 +15,22 @@
<summary>Native library required by gRPC C#</summary> <summary>Native library required by gRPC C#</summary>
<tags>gRPC native</tags> <tags>gRPC native</tags>
<dependencies> <dependencies>
<dependency id="grpc.dependencies.zlib.redist" version="1.2.8.9" /> <dependency id="grpc.dependencies.zlib.redist" version="1.2.8.10" />
<dependency id="grpc.dependencies.openssl.redist" version="1.0.2.3" /> <dependency id="grpc.dependencies.openssl.redist" version="1.0.204.1" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<file src="grpc.native.csharp.props" target="\build\portable-net45\grpc.native.csharp.props" /> <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\grpc.native.csharp.targets" /> <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\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" /> <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\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> </files>
</package> </package>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <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> <CopyNativeDependencies Condition=" '$(CopyNativeDependencies)' == '' ">true</CopyNativeDependencies>
<!-- Set defaults for native dependencies if not already set. Properties can be overriden in the project files. --> <!-- Set defaults for native dependencies if not already set. Properties can be overriden in the project files. -->

Loading…
Cancel
Save