4 files changed, 29 insertions, 21 deletions
diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/client/client.vcxproj
index 366fdc49e60..b14d195228e 100644
--- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" />
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -88,6 +88,8 @@
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
   <ImportGroup Label="ExtensionSettings">
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -276,8 +278,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets'))" />
   </Target>
   <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj
index 34aa4be1d20..1ebb2ab022d 100644
--- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" />
   <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" />
+  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Cpp11-Debug|Win32">
       <Configuration>Cpp11-Debug</Configuration>
@@ -88,6 +88,8 @@
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
   <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
   <ImportGroup Label="ExtensionSettings">
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" />
+    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -313,17 +315,19 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" />
-  </Target>
   <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
   </Target>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets'))" />
+  </Target>
 </Project>
 \ No newline at end of file
diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
index 84c7ead41db..041bd2305e9 100644
--- a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
@@ -252,11 +252,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
   </Target>
   <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
index f36828f8a34..0372fc05191 100644
--- a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
@@ -258,11 +258,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
   </Target>
   <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>