improve injected .targets files

9 files changed, 85 insertions, 42 deletions

diff --git a/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg b/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
index fbf6d63f1c..1f4762d155 100644
--- a/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
+++ b/vsprojects/coapp/openssl/grpc.dependencies.openssl.autopkg
@@ -52,7 +52,6 @@ nuget {
           };
 		  #destination = "\build\portable-net45+netcore45+wpa81+wp8";
 		  "managed_targets\${package-id}.redist.targets";
-		  "managed_targets\${package-id}.redist.props";
 		};
 		
 		nestedInclude: {
diff --git a/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.props b/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.props
deleted file mode 100644
index 63d23be3da..0000000000
--- a/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.props
+++ /dev/null
@@ -1,12 +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>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
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 1eb63f3fc4..3ffc8341a2 100644
--- a/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets
+++ b/vsprojects/coapp/openssl/managed_targets/grpc.dependencies.openssl.redist.targets
@@ -1,5 +1,32 @@
 <?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>
+  </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' ">
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>
diff --git a/vsprojects/nuget_package/grpc.native.csharp.nuspec b/vsprojects/nuget_package/grpc.native.csharp.nuspec
index c151ae288a..0f65d1e1a1 100644
--- a/vsprojects/nuget_package/grpc.native.csharp.nuspec
+++ b/vsprojects/nuget_package/grpc.native.csharp.nuspec
@@ -20,7 +20,6 @@
     </dependencies>
   </metadata>
   <files>
-    <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 -->
diff --git a/vsprojects/nuget_package/grpc.native.csharp.props b/vsprojects/nuget_package/grpc.native.csharp.props
deleted file mode 100644
index e8b1ab51da..0000000000
--- a/vsprojects/nuget_package/grpc.native.csharp.props
+++ /dev/null
@@ -1,12 +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 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. -->
-	<NativeDependenciesToolset Condition=" '$(NativeDependenciesToolset)' == '' ">v120</NativeDependenciesToolset>
-    <NativeDependenciesPlatform Condition=" '$(NativeDependenciesPlatform)' == '' ">Win32</NativeDependenciesPlatform>
-    <NativeDependenciesConfiguration Condition=" '$(NativeDependenciesConfiguration)' == '' ">Debug</NativeDependenciesConfiguration>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/vsprojects/nuget_package/grpc.native.csharp.targets b/vsprojects/nuget_package/grpc.native.csharp.targets
index 1b69362d43..9544a559b9 100644
--- a/vsprojects/nuget_package/grpc.native.csharp.targets
+++ b/vsprojects/nuget_package/grpc.native.csharp.targets
@@ -1,5 +1,32 @@
 <?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>
+  </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' ">