diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-12-03 11:40:17 -0800 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-12-03 11:40:17 -0800 |
| commit | f7abb65c37bb114bc73e54bf46b11066a29f545b (patch) | |
| tree | c0611cd247e434f130fcb71c7622f6086bf9fe76 | |
| parent | 35c1d3c462757d1dcc1c75d07614fbc0b4b1d60c (diff) | |
| parent | 878d0690891d6cde2c317bbfeb92478ab1d54458 (diff) | |
Merge pull request #4276 from jtattermusch/vs2015_fixup
Fixup nuget packages
| -rw-r--r-- | vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets | 4 | ||||
| -rw-r--r-- | vsprojects/nuget_package/grpc.native.csharp.targets | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets b/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets index 3ffc8341a2..6ee46ba3bc 100644 --- a/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets +++ b/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets @@ -29,8 +29,8 @@ </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\libeay32.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> diff --git a/vsprojects/nuget_package/grpc.native.csharp.targets b/vsprojects/nuget_package/grpc.native.csharp.targets index 9544a559b9..e59215b835 100644 --- a/vsprojects/nuget_package/grpc.native.csharp.targets +++ b/vsprojects/nuget_package/grpc.native.csharp.targets @@ -29,8 +29,8 @@ </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)\grpc_csharp_ext.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> |