diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-12-01 10:48:16 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-12-01 18:23:01 -0800 |
| commit | 2977f9326d0ad5f03b854674adad895a92baf769 (patch) | |
| tree | ec983cfd6336274a91445d6336081a7737e50bd9 /vsprojects/coapp/zlib | |
| parent | 36065beee283e20ab566074750e0dc4410902332 (diff) | |
improve injected .targets files
Diffstat (limited to 'vsprojects/coapp/zlib')
3 files changed, 31 insertions, 16 deletions
diff --git a/vsprojects/coapp/zlib/grpc.dependencies.zlib.autopkg b/vsprojects/coapp/zlib/grpc.dependencies.zlib.autopkg index 69b3bae19c..9dcc43aef3 100644 --- a/vsprojects/coapp/zlib/grpc.dependencies.zlib.autopkg +++ b/vsprojects/coapp/zlib/grpc.dependencies.zlib.autopkg @@ -44,7 +44,6 @@ nuget { package = redist; }; #destination = "\build\portable-net45+netcore45+wpa81+wp8"; - "managed_targets\${package-id}.redist.props"; "managed_targets\${package-id}.redist.targets"; }; diff --git a/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.props b/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.props deleted file mode 100644 index bcb37de0f7..0000000000 --- a/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.props +++ /dev/null @@ -1,13 +0,0 @@ -<?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 --> - <CopyNativeDependencies Condition=" '$(CopyNativeDependencies)' == '' ">true</CopyNativeDependencies> - - <!-- Set defaults for native dependencies if not already set. Properties can be overriden in the project files. --> - <NativeDependenciesToolset Condition=" '$(NativeDependenciesToolset)' == '' ">v120</NativeDependenciesToolset> - <NativeDependenciesPlatform Condition=" '$(NativeDependenciesPlatform)' == '' ">Win32</NativeDependenciesPlatform> - <NativeDependenciesConfiguration Condition=" '$(NativeDependenciesConfiguration)' == '' ">Debug</NativeDependenciesConfiguration> - <ZlibCallingConvention Condition=" '$(ZlibCallingConvention)' == '' ">cdecl</ZlibCallingConvention> - </PropertyGroup> -</Project>
\ No newline at end of file diff --git a/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.targets b/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.targets index f00d97dc36..03002d0727 100644 --- a/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.targets +++ b/vsprojects/coapp/zlib/managed_targets/grpc.dependencies.zlib.redist.targets @@ -1,9 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <!-- + Whether or not to copy native dependencies to output directory as part of build. + If not explicitly specified in the project file, this defaults to true on Windows + and false on Unix systems. + --> + <CopyNativeDependencies Condition=" '$(CopyNativeDependencies)' == '' And '$(OS)' != 'Unix' ">true</CopyNativeDependencies> + <CopyNativeDependencies Condition=" '$(CopyNativeDependencies)' == '' And '$(OS)' == 'Unix' ">false</CopyNativeDependencies> + + <!-- + Select which platform toolset of native dependencies to use based on VS version (v120 is the default). + Value can be explicitly specified in the project file. + --> + <NativeDependenciesToolset Condition=" '$(NativeDependenciesToolset)' == '' And '$(VisualStudioVersion)' == '14.0' ">v140</NativeDependenciesToolset> + <NativeDependenciesToolset Condition=" '$(NativeDependenciesToolset)' == '' And '$(VisualStudioVersion)' == '10.0' ">v100</NativeDependenciesToolset> + <NativeDependenciesToolset Condition=" '$(NativeDependenciesToolset)' == '' ">v120</NativeDependenciesToolset> + + <!-- Select which platform of native dependencies to use. Value can be explicitly specified in the project file. --> + <NativeDependenciesPlatform Condition=" '$(NativeDependenciesPlatform)' == '' ">Win32</NativeDependenciesPlatform> + + <!-- + Select which configuration of native dependencies to use. Uses release build if project configuration is Release, + otherwise defaults to Debug. Value can be explicitly specified in the project file. + --> + <NativeDependenciesConfiguration Condition=" '$(NativeDependenciesConfiguration)' == '' And '$(Configuration)' == 'Release' ">Release</NativeDependenciesConfiguration> + <NativeDependenciesConfiguration Condition=" '$(NativeDependenciesConfiguration)' == '' ">Debug</NativeDependenciesConfiguration> + + <ZlibCallingConvention Condition=" '$(ZlibCallingConvention)' == '' ">cdecl</ZlibCallingConvention> + </PropertyGroup> <Choose> <!-- Under older versions of Monodevelop, Choose is not supported and is just ignored, which gives us the desired effect. --> - <When Condition=" '$(OS)' != 'Unix' "> - <ItemGroup Condition=" '$(CopyNativeDependencies)' == 'true' "> + <When Condition=" '$(CopyNativeDependencies)' == 'true' "> + <ItemGroup> <Content Include="$(MSBuildThisFileDirectory)..\..\build\native\bin\$(NativeDependenciesToolset)\$(NativeDependenciesPlatform)\$(NativeDependenciesConfiguration)\dynamic\$(ZlibCallingConvention)\zlib.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> |