Nuget package updates

6 files changed, 54 insertions, 85 deletions

diff --git a/cpp/msbuild/ice.nuget.uwp.targets b/cpp/msbuild/ice.nuget.uwp.targets
index 1687459e424..9474689adfa 100644
--- a/cpp/msbuild/ice.nuget.uwp.targets
+++ b/cpp/msbuild/ice.nuget.uwp.targets
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <!-- Static libraries -->
-    <ItemGroup>
+    <ItemGroup Condition="'$(Platform)' == 'Win32' or '$(Platform)' == 'x64'">
         <Libraries Include="$(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.lib"/>
         <Libraries Include="$(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.pdb"/>
     </ItemGroup>
diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj
index b451f84a075..9e00d98039a 100644
--- a/cpp/msbuild/ice.proj
+++ b/cpp/msbuild/ice.proj
@@ -53,9 +53,9 @@
         <UWPDistSolution Include="ice.uwp.sln">
           <Properties>Configuration=Debug;Platform=x64</Properties>
         </UWPDistSolution>
-        <UWPDistSolution Include="ice.uwp.sln">
+        <IoTDistSolution Include="ice.uwp.sln">
           <Properties>Configuration=Debug;Platform=ARM</Properties>
-        </UWPDistSolution>
+        </IoTDistSolution>
 
         <UWPDistSolution Include="ice.uwp.sln">
           <Properties>Configuration=Release;Platform=Win32</Properties>
@@ -63,9 +63,9 @@
         <UWPDistSolution Include="ice.uwp.sln">
           <Properties>Configuration=Release;Platform=x64</Properties>
         </UWPDistSolution>
-        <UWPDistSolution Include="ice.uwp.sln">
+        <IoTDistSolution Include="ice.uwp.sln">
           <Properties>Configuration=Release;Platform=ARM</Properties>
-        </UWPDistSolution>
+        </IoTDistSolution>
       </ItemGroup>
 
       <!-- Ice for C++ test configurations (C++98 mapping) -->
@@ -108,18 +108,18 @@
         <UWPTestSolution Include="ice.testuwp.sln">
           <Properties>Configuration=Debug;Platform=x64</Properties>
         </UWPTestSolution>
-        <UWPTestSolution Include="ice.testuwp.sln">
+        <IoTTestSolution Include="ice.testuwp.sln">
           <Properties>Configuration=Debug;Platform=ARM</Properties>
-        </UWPTestSolution>
+        </IoTTestSolution>
         <UWPTestSolution Include="ice.testuwp.sln">
           <Properties>Configuration=Release;Platform=Win32</Properties>
         </UWPTestSolution>
         <UWPTestSolution Include="ice.testuwp.sln">
           <Properties>Configuration=Release;Platform=x64</Properties>
         </UWPTestSolution>
-        <UWPTestSolution Include="ice.testuwp.sln">
+        <IoTTestSolution Include="ice.testuwp.sln">
           <Properties>Configuration=Release;Platform=ARM</Properties>
-        </UWPTestSolution>
+        </IoTTestSolution>
       </ItemGroup>
     </When>
     <Otherwise>
@@ -130,13 +130,6 @@
         </DistSolution>
       </ItemGroup>
 
-      <!-- ARM Builds require Win32 for the Slice translators -->
-      <ItemGroup Condition="'$(Platform)' == 'ARM'">
-        <DistSolution Include="ice.$(DefaultPlatformToolset).sln">
-          <Properties>Configuration=$(Configuration);Platform=Win32</Properties>
-        </DistSolution>
-      </ItemGroup>
-
       <!-- Ice for UWP builds -->
       <ItemGroup Condition="'$(DefaultPlatformToolset)' == 'v140'">
         <UWPDistSolution Include="ice.uwp.sln">
@@ -159,11 +152,17 @@
       </ItemGroup>
 
       <!-- Ice for UWP test configurations (C++11 mapping) requires v140 -->
-      <ItemGroup Condition="'$(DefaultPlatformToolset)' == 'v140'">
+      <ItemGroup Condition="'$(DefaultPlatformToolset)' == 'v140' and '$(Platform)' != 'ARM'">
         <UWPTestSolution Include="ice.testuwp.sln">
           <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties>
         </UWPTestSolution>
       </ItemGroup>
+
+      <ItemGroup Condition="'$(DefaultPlatformToolset)' == 'v140' and '$(Platform)' == 'ARM'">
+        <IoTTestSolution Include="ice.testuwp.sln">
+          <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties>
+        </IoTTestSolution>
+      </ItemGroup>
     </Otherwise>
   </Choose>
 
@@ -215,6 +214,8 @@
           DestinationFolder="zeroc.ice.$(DefaultPlatformToolset)" />
     <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).props"
           DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\build\native\zeroc.ice.$(DefaultPlatformToolset).props" />
+    <Copy SourceFiles="zeroc.ice.props"
+          DestinationFiles="zeroc.ice.$(DefaultPlatformToolset)\build\native\zeroc.ice.props" />
     <Copy SourceFiles="zeroc.ice.$(DefaultPlatformToolset).targets"
           DestinationFolder="zeroc.ice.$(DefaultPlatformToolset)\build\native" />
     <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive"
@@ -279,6 +280,8 @@
 
     <Copy SourceFiles="zeroc.ice.uwp.nuspec"
           DestinationFolder="zeroc.ice.uwp" />
+    <Copy SourceFiles="zeroc.ice.props"
+          DestinationFiles="zeroc.ice.uwp\build\native\zeroc.ice.props" />
     <Copy SourceFiles="zeroc.ice.uwp.props"
           DestinationFiles="zeroc.ice.uwp\build\native\zeroc.ice.uwp.props" />
     <Copy SourceFiles="zeroc.ice.uwp.targets"
diff --git a/cpp/msbuild/zeroc.ice.props b/cpp/msbuild/zeroc.ice.props
new file mode 100644
index 00000000000..f7c213bea16
--- /dev/null
+++ b/cpp/msbuild/zeroc.ice.props
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup Condition="'$(UseDebugLibraries)' == 'true'">
+        <Ice_Configuration>Debug</Ice_Configuration>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(UseDebugLibraries)' != 'true'">
+        <Ice_Configuration>Release</Ice_Configuration>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <IceVersion>3.7a3</IceVersion>
+        <IceIntVersion>30753</IceIntVersion>
+        <IceVersionMM>3.7</IceVersionMM>
+        <IceSoVersion>37a3</IceSoVersion>
+        <IceNugetPackageVersion>3.7.53.0</IceNugetPackageVersion>
+        <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
+
+        <IceToolsPath>$(IceHome)\build\native\bin\Win32\Release</IceToolsPath>
+        <IceBinPath>$(IceHome)\build\native\bin\$(Platform)\$(Ice_Configuration)</IceBinPath>
+        <IceLibraryPath>$(IceHome)\build\native\lib\$(Platform)\$(Ice_Configuration)</IceLibraryPath>
+        <IceIncludePath>$(IceHome)\build\native\include</IceIncludePath>
+
+        <Path>$(IceBinPath);$(IceToolsPath);%(Path)</Path>
+    </PropertyGroup>
+
+</Project>
diff --git a/cpp/msbuild/zeroc.ice.uwp.props b/cpp/msbuild/zeroc.ice.uwp.props
index 4393be7622a..eef59dd2dc2 100644
--- a/cpp/msbuild/zeroc.ice.uwp.props
+++ b/cpp/msbuild/zeroc.ice.uwp.props
@@ -2,28 +2,8 @@
 <!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <PropertyGroup Condition="'$(UseDebugLibraries)' == 'true'">
-        <Ice_Configuration>Debug</Ice_Configuration>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(UseDebugLibraries)' != 'true'">
-        <Ice_Configuration>Release</Ice_Configuration>
-    </PropertyGroup>
-
     <PropertyGroup>
-
-        <IceVersion>3.7a3</IceVersion>
-        <IceIntVersion>30753</IceIntVersion>
-        <IceVersionMM>3.7</IceVersionMM>
-
-        <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
-
-        <IceToolsPath>$(IceHome)\build\native\bin\Win32\Release</IceToolsPath>
-        <IceBinPath>$(IceHome)\build\native\bin\$(Platform)\$(Ice_Configuration)</IceBinPath>
-        <IceLibraryPath>$(IceHome)\build\native\lib\$(Platform)\$(Ice_Configuration)</IceLibraryPath>
-        <IceIncludePath>$(IceHome)\build\native\include</IceIncludePath>
-
-        <Path>$(IceToolsBin);%(Path)</Path>
+        <IceUWPPackage>$(MSBuildThisFileDirectory)zeroc.ice.props</IceUWPPackage>
     </PropertyGroup>
 
 </Project>
diff --git a/cpp/msbuild/zeroc.ice.v120.props b/cpp/msbuild/zeroc.ice.v120.props
index 661cbab4a4c..023493da082 100644
--- a/cpp/msbuild/zeroc.ice.v120.props
+++ b/cpp/msbuild/zeroc.ice.v120.props
@@ -2,31 +2,8 @@
 <!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <PropertyGroup Condition="'$(UseDebugLibraries)' == 'true'">
-        <Ice_Configuration>Debug</Ice_Configuration>
-        <Ice_LibrarySuffix>d</Ice_LibrarySuffix>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(UseDebugLibraries)' != 'true'">
-        <Ice_Configuration>Release</Ice_Configuration>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(PlatformToolset)' == 'v120'">
-        <IceVersion>3.7a3</IceVersion>
-        <IceIntVersion>30753</IceIntVersion>
-        <IceVersionMM>3.7</IceVersionMM>
-        <IceSoVersion>37a3</IceSoVersion>
-        <IceNugetPackageVersion>3.7.53.0</IceNugetPackageVersion>
-        <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
-
-        <SliceLibraryName>slice$(IceSoVersion)$(Ice_LibrarySuffix).dll</SliceLibraryName>
-
-        <IceToolsPath>$(IceHome)\build\native\bin\Win32\Release</IceToolsPath>
-        <IceBinPath>$(IceHome)\build\native\bin\$(Platform)\$(Ice_Configuration)</IceBinPath>
-        <IceLibraryPath>$(IceHome)\build\native\lib\$(Platform)\$(Ice_Configuration)</IceLibraryPath>
-        <IceIncludePath>$(IceHome)\build\native\include</IceIncludePath>
-
-        <Path>$(IceBinPath);$(IceToolsPath);%(Path)</Path>
+    <PropertyGroup>
+        <Icev120Package>$(MSBuildThisFileDirectory)zeroc.ice.props</Icev120Package>
     </PropertyGroup>
 
 </Project>
diff --git a/cpp/msbuild/zeroc.ice.v140.props b/cpp/msbuild/zeroc.ice.v140.props
index 4bf7038058e..e03a7d124b3 100644
--- a/cpp/msbuild/zeroc.ice.v140.props
+++ b/cpp/msbuild/zeroc.ice.v140.props
@@ -2,28 +2,8 @@
 <!-- Copyright (c) 2009-2016 ZeroC, Inc. All rights reserved. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <PropertyGroup Condition="'$(UseDebugLibraries)' == 'true'">
-        <Ice_Configuration>Debug</Ice_Configuration>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(UseDebugLibraries)' != 'true'">
-        <Ice_Configuration>Release</Ice_Configuration>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'">
-        <IceVersion>3.7a3</IceVersion>
-        <IceIntVersion>30753</IceIntVersion>
-        <IceVersionMM>3.7</IceVersionMM>
-        <IceSoVersion>37a3</IceSoVersion>
-        <IceNugetPackageVersion>3.7.53.0</IceNugetPackageVersion>
-        <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome>
-
-        <IceToolsPath>$(IceHome)\build\native\bin\Win32\Release</IceToolsPath>
-        <IceBinPath>$(IceHome)\build\native\bin\$(Platform)\$(Ice_Configuration)</IceBinPath>
-        <IceLibraryPath>$(IceHome)\build\native\lib\$(Platform)\$(Ice_Configuration)</IceLibraryPath>
-        <IceIncludePath>$(IceHome)\build\native\include</IceIncludePath>
-
-        <Path>$(IceBinPath);$(IceToolsPath);%(Path)</Path>
+    <PropertyGroup>
+        <Icev140Package>$(MSBuildThisFileDirectory)zeroc.ice.props</Icev140Package>
     </PropertyGroup>
 
 </Project>