unify .targets file with zlib nuget

pull/4276/head
Jan Tattermusch 9 years ago
parent 8b5122e779
commit 878d069089
  1. 4
      vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets
  2. 4
      vsprojects/nuget_package/grpc.native.csharp.targets

@ -29,8 +29,8 @@
</PropertyGroup> </PropertyGroup>
<Choose> <Choose>
<!-- Under older versions of Monodevelop, Choose is not supported and is just ignored, which gives us the desired effect. --> <!-- Under older versions of Monodevelop, Choose is not supported and is just ignored, which gives us the desired effect. -->
<When Condition=" '$(OS)' != 'Unix' "> <When Condition=" '$(CopyNativeDependencies)' == 'true' ">
<ItemGroup Condition=" '$(CopyNativeDependencies)' == 'true' "> <ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)..\..\build\native\bin\$(NativeDependenciesToolset)\$(NativeDependenciesPlatform)\$(NativeDependenciesConfiguration)\dynamic\libeay32.dll"> <Content Include="$(MSBuildThisFileDirectory)..\..\build\native\bin\$(NativeDependenciesToolset)\$(NativeDependenciesPlatform)\$(NativeDependenciesConfiguration)\dynamic\libeay32.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

@ -29,8 +29,8 @@
</PropertyGroup> </PropertyGroup>
<Choose> <Choose>
<!-- Under older versions of Monodevelop, Choose is not supported and is just ignored, which gives us the desired effect. --> <!-- Under older versions of Monodevelop, Choose is not supported and is just ignored, which gives us the desired effect. -->
<When Condition=" '$(OS)' != 'Unix' "> <When Condition=" '$(CopyNativeDependencies)' == 'true' ">
<ItemGroup Condition=" '$(CopyNativeDependencies)' == 'true' "> <ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)..\..\build\native\bin\$(NativeDependenciesToolset)\$(NativeDependenciesPlatform)\$(NativeDependenciesConfiguration)\grpc_csharp_ext.dll"> <Content Include="$(MSBuildThisFileDirectory)..\..\build\native\bin\$(NativeDependenciesToolset)\$(NativeDependenciesPlatform)\$(NativeDependenciesConfiguration)\grpc_csharp_ext.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

Loading…
Cancel
Save