Fix (ICE-7498) - Port more test to UWP

author: Jose <jose@zeroc.com> 2017-03-24 12:33:33 +0100
committer: Jose <jose@zeroc.com> 2017-03-24 12:33:33 +0100
commit: cdd283db257b308dd2a07171f5d2eb5e9672bc3e (patch)
tree: c4791dc0c68cae3fd5e417f723d5546c8c554758 /cpp/test/uwp/controller
parent: ICE-7680: replace Thread by Runnable (diff)
download: ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.tar.bz2
ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.tar.xz
ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.zip
2 files changed, 1842 insertions, 1177 deletions
diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj b/cpp/test/uwp/controller/msbuild/controller.vcxproj
index 5975e46391c..8eb552da8c0 100644
--- a/cpp/test/uwp/controller/msbuild/controller.vcxproj
+++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj
@@ -320,437 +320,9 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-  </ItemGroup>
-  <ItemGroup>
     <IceBuilder Include="..\..\..\..\..\scripts\Controller.ice" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\ARM\Debug\IceSSL_configuration_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\ARM\Release\IceSSL_configuration_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\Win32\Debug\IceSSL_configuration_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\Win32\Release\IceSSL_configuration_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\x64\Debug\IceSSL_configuration_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\x64\Release\IceSSL_configuration_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Debug\Ice_optional_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Release\Ice_optional_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Debug\Ice_optional_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Release\Ice_optional_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Debug\Ice_optional_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Release\Ice_optional_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Debug\Ice_optional_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Release\Ice_optional_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Debug\Ice_optional_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Release\Ice_optional_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Debug\Ice_optional_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Release\Ice_optional_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Debug\Ice_optional_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Release\Ice_optional_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Debug\Ice_optional_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Release\Ice_optional_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Debug\Ice_optional_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Release\Ice_optional_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Debug\Ice_acm_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\Win32\Debug\Ice_acm_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\Win32\Debug\Ice_adapterDeactivation_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\Win32\Debug\Ice_adapterDeactivation_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\Win32\Debug\Ice_adapterDeactivation_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\Win32\Debug\Ice_admin_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\Win32\Debug\Ice_admin_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\Win32\Debug\Ice_ami_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\Win32\Debug\Ice_ami_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\Win32\Debug\Ice_ami_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\Win32\Debug\Ice_binding_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Debug\Ice_binding_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Debug\Ice_dispatcher_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\Win32\Debug\Ice_dispatcher_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\Win32\Debug\Ice_dispatcher_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\Win32\Debug\Ice_enums_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\Win32\Debug\Ice_enums_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\Win32\Debug\Ice_exceptions_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\Win32\Debug\Ice_exceptions_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\Win32\Debug\Ice_exceptions_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\Win32\Debug\Ice_exceptions_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\Win32\Debug\Ice_facets_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\Win32\Debug\Ice_facets_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\Win32\Debug\Ice_facets_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\Win32\Debug\Ice_hash_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\Win32\Debug\Ice_hold_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\Win32\Debug\Ice_hold_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\Win32\Debug\Ice_info_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\Win32\Debug\Ice_info_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\Win32\Debug\Ice_inheritance_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\Win32\Debug\Ice_inheritance_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Debug\Ice_inheritance_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Debug\Ice_invoke_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\Win32\Debug\Ice_invoke_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\Win32\Debug\Ice_location_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\Win32\Debug\Ice_location_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\Win32\Debug\Ice_metrics_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\Win32\Debug\Ice_metrics_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Debug\Ice_metrics_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\Win32\Debug\Ice_metrics_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Debug\Ice_objects_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\Win32\Debug\Ice_objects_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\Win32\Debug\Ice_objects_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\Win32\Debug\Ice_operations_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\Win32\Debug\Ice_operations_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Debug\Ice_operations_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\Win32\Debug\Ice_operations_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Debug\Ice_proxy_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\Win32\Debug\Ice_proxy_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\Win32\Debug\Ice_proxy_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\Win32\Debug\Ice_proxy_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\Win32\Debug\Ice_retry_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\Win32\Debug\Ice_retry_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Debug\Ice_retry_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Debug\Ice_stream_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Debug\Ice_timeout_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Debug\Ice_timeout_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Debug\Ice_udp_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Debug\Ice_udp_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Release\Ice_acm_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\Win32\Release\Ice_acm_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\Win32\Release\Ice_adapterDeactivation_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\Win32\Release\Ice_adapterDeactivation_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\Win32\Release\Ice_adapterDeactivation_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\Win32\Release\Ice_admin_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\Win32\Release\Ice_admin_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\Win32\Release\Ice_ami_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\Win32\Release\Ice_ami_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\Win32\Release\Ice_ami_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\Win32\Release\Ice_binding_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Release\Ice_binding_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Release\Ice_dispatcher_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\Win32\Release\Ice_dispatcher_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\Win32\Release\Ice_dispatcher_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\Win32\Release\Ice_enums_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\Win32\Release\Ice_enums_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\Win32\Release\Ice_exceptions_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\Win32\Release\Ice_exceptions_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\Win32\Release\Ice_exceptions_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\Win32\Release\Ice_exceptions_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\Win32\Release\Ice_facets_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\Win32\Release\Ice_facets_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\Win32\Release\Ice_facets_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\Win32\Release\Ice_hash_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\Win32\Release\Ice_hold_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\Win32\Release\Ice_hold_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\Win32\Release\Ice_info_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\Win32\Release\Ice_info_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\Win32\Release\Ice_inheritance_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\Win32\Release\Ice_inheritance_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Release\Ice_inheritance_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Release\Ice_invoke_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\Win32\Release\Ice_invoke_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\Win32\Release\Ice_location_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\Win32\Release\Ice_location_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\Win32\Release\Ice_metrics_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\Win32\Release\Ice_metrics_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Release\Ice_metrics_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\Win32\Release\Ice_metrics_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Release\Ice_objects_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\Win32\Release\Ice_objects_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\Win32\Release\Ice_objects_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\Win32\Release\Ice_operations_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\Win32\Release\Ice_operations_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Release\Ice_operations_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\Win32\Release\Ice_operations_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Release\Ice_proxy_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\Win32\Release\Ice_proxy_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\Win32\Release\Ice_proxy_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\Win32\Release\Ice_proxy_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\Win32\Release\Ice_retry_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\Win32\Release\Ice_retry_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Release\Ice_retry_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Release\Ice_stream_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Release\Ice_timeout_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Release\Ice_timeout_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Release\Ice_udp_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Release\Ice_udp_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
-    </None>
     <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Debug\Ice_acm_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
@@ -787,6 +359,30 @@
     <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Debug\Ice_binding_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Debug\Ice_checksum_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Debug\Ice_checksum_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Debug\Ice_custom_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\x64\Debug\Ice_custom_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\x64\Debug\Ice_custom_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\x64\Debug\Ice_custom_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\x64\Debug\Ice_defaultServant_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\x64\Debug\Ice_defaultValue_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\x64\Debug\Ice_dispatcher_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
@@ -808,10 +404,10 @@
     <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\x64\Debug\Ice_exceptions_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Debug\Ice_exceptions_serveramd.dll">
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Debug\Ice_exceptions_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Debug\Ice_exceptions_server.dll">
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Debug\Ice_exceptions_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\facets\msbuild\uwp\client\x64\Debug\Ice_facets_client.dll">
@@ -847,6 +443,9 @@
     <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\x64\Debug\Ice_inheritance_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\x64\Debug\Ice_interceptor_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\x64\Debug\Ice_invoke_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
@@ -865,10 +464,16 @@
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Debug\Ice_metrics_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Debug\Ice_metrics_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Debug\Ice_metrics_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Debug\Ice_metrics_server.dll">
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\x64\Debug\Ice_networkProxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\x64\Debug\Ice_networkProxy_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\objects\msbuild\uwp\client\x64\Debug\Ice_objects_client.dll">
@@ -886,10 +491,19 @@
     <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\x64\Debug\Ice_operations_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Debug\Ice_operations_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\x64\Debug\Ice_operations_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Debug\Ice_operations_server.dll">
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Debug\Ice_optional_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Debug\Ice_optional_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Debug\Ice_optional_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Debug\Ice_proxy_client.dll">
@@ -898,10 +512,10 @@
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Debug\Ice_proxy_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Debug\Ice_proxy_serveramd.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Debug\Ice_proxy_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Debug\Ice_proxy_server.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Debug\Ice_proxy_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Debug\Ice_retry_client.dll">
@@ -913,9 +527,48 @@
     <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Debug\Ice_retry_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\x64\Debug\Ice_servantLocator_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\x64\Debug\Ice_servantLocator_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\x64\Debug\Ice_servantLocator_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\x64\Debug\Ice_servantLocator_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\x64\Debug\Ice_services_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\x64\Debug\Ice_slicing_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\x64\Debug\Ice_slicing_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\x64\Debug\Ice_slicing_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\x64\Debug\Ice_slicing_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\x64\Debug\Ice_slicing_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\x64\Debug\Ice_slicing_objects_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\stream\msbuild\uwp\x64\Debug\Ice_stream_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\x64\Debug\Ice_stringConverter_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\x64\Debug\Ice_stringConverter_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Debug\Ice_timeout_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
@@ -928,6 +581,8 @@
     <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Debug\Ice_udp_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
     </None>
+  </ItemGroup>
+  <ItemGroup>
     <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Release\Ice_acm_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
@@ -964,6 +619,30 @@
     <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Release\Ice_binding_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Release\Ice_checksum_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Release\Ice_checksum_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Release\Ice_custom_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\x64\Release\Ice_custom_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\x64\Release\Ice_custom_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\x64\Release\Ice_custom_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\x64\Release\Ice_defaultServant_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\x64\Release\Ice_defaultValue_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\x64\Release\Ice_dispatcher_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
@@ -985,10 +664,10 @@
     <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\x64\Release\Ice_exceptions_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Release\Ice_exceptions_serveramd.dll">
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Release\Ice_exceptions_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Release\Ice_exceptions_server.dll">
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Release\Ice_exceptions_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\facets\msbuild\uwp\client\x64\Release\Ice_facets_client.dll">
@@ -1024,6 +703,9 @@
     <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\x64\Release\Ice_inheritance_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\x64\Release\Ice_interceptor_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\x64\Release\Ice_invoke_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
@@ -1042,10 +724,16 @@
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Release\Ice_metrics_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Release\Ice_metrics_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Release\Ice_metrics_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Release\Ice_metrics_server.dll">
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\x64\Release\Ice_networkProxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\x64\Release\Ice_networkProxy_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\objects\msbuild\uwp\client\x64\Release\Ice_objects_client.dll">
@@ -1063,10 +751,19 @@
     <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\x64\Release\Ice_operations_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Release\Ice_operations_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\x64\Release\Ice_operations_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Release\Ice_operations_server.dll">
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Release\Ice_optional_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Release\Ice_optional_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Release\Ice_optional_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Release\Ice_proxy_client.dll">
@@ -1075,10 +772,10 @@
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Release\Ice_proxy_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Release\Ice_proxy_serveramd.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Release\Ice_proxy_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Release\Ice_proxy_server.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Release\Ice_proxy_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Release\Ice_retry_client.dll">
@@ -1090,9 +787,48 @@
     <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Release\Ice_retry_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\x64\Release\Ice_servantLocator_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\x64\Release\Ice_servantLocator_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\x64\Release\Ice_servantLocator_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\x64\Release\Ice_servantLocator_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\x64\Release\Ice_services_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\x64\Release\Ice_slicing_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\x64\Release\Ice_slicing_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\x64\Release\Ice_slicing_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\x64\Release\Ice_slicing_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\x64\Release\Ice_slicing_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\x64\Release\Ice_slicing_objects_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\stream\msbuild\uwp\x64\Release\Ice_stream_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\x64\Release\Ice_stringConverter_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\x64\Release\Ice_stringConverter_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Release\Ice_timeout_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
@@ -1105,183 +841,528 @@
     <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Release\Ice_udp_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Release\Ice_acm_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Release\Ice_acm_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\ARM\Release\Ice_acm_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\Win32\Release\Ice_acm_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\ARM\Release\Ice_adapterDeactivation_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\Win32\Release\Ice_adapterDeactivation_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\ARM\Release\Ice_adapterDeactivation_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\Win32\Release\Ice_adapterDeactivation_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\ARM\Release\Ice_adapterDeactivation_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\Win32\Release\Ice_adapterDeactivation_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\ARM\Release\Ice_admin_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\Win32\Release\Ice_admin_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\ARM\Release\Ice_admin_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\Win32\Release\Ice_admin_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\ARM\Release\Ice_ami_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\Win32\Release\Ice_ami_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\ARM\Release\Ice_ami_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\Win32\Release\Ice_ami_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\ARM\Release\Ice_ami_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\Win32\Release\Ice_ami_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\ARM\Release\Ice_binding_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\Win32\Release\Ice_binding_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Release\Ice_binding_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Release\Ice_binding_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\ARM\Release\Ice_dispatcher_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Release\Ice_checksum_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\ARM\Release\Ice_dispatcher_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Release\Ice_checksum_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\ARM\Release\Ice_dispatcher_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Release\Ice_custom_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\ARM\Release\Ice_enums_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\Win32\Release\Ice_custom_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\ARM\Release\Ice_enums_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\Win32\Release\Ice_custom_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\ARM\Release\Ice_exceptions_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\Win32\Release\Ice_custom_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\ARM\Release\Ice_exceptions_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\Win32\Release\Ice_defaultServant_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\ARM\Release\Ice_exceptions_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\Win32\Release\Ice_defaultValue_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\ARM\Release\Ice_exceptions_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Release\Ice_dispatcher_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\ARM\Release\Ice_facets_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\Win32\Release\Ice_dispatcher_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\ARM\Release\Ice_facets_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\Win32\Release\Ice_dispatcher_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\ARM\Release\Ice_facets_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\Win32\Release\Ice_enums_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\ARM\Release\Ice_hash_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\Win32\Release\Ice_enums_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\ARM\Release\Ice_hold_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\Win32\Release\Ice_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\ARM\Release\Ice_hold_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\Win32\Release\Ice_exceptions_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\ARM\Release\Ice_info_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\Win32\Release\Ice_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\ARM\Release\Ice_info_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\Win32\Release\Ice_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\ARM\Release\Ice_inheritance_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\Win32\Release\Ice_facets_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\ARM\Release\Ice_inheritance_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\Win32\Release\Ice_facets_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\ARM\Release\Ice_inheritance_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\Win32\Release\Ice_facets_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\ARM\Release\Ice_invoke_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\Win32\Release\Ice_hash_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\ARM\Release\Ice_invoke_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\Win32\Release\Ice_hold_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\ARM\Release\Ice_location_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\Win32\Release\Ice_hold_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\ARM\Release\Ice_location_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\client\Win32\Release\Ice_info_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\ARM\Release\Ice_metrics_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\server\Win32\Release\Ice_info_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\ARM\Release\Ice_metrics_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\Win32\Release\Ice_inheritance_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\ARM\Release\Ice_metrics_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\Win32\Release\Ice_inheritance_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\ARM\Release\Ice_metrics_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Release\Ice_inheritance_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\ARM\Release\Ice_objects_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\Win32\Release\Ice_interceptor_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\ARM\Release\Ice_objects_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Release\Ice_invoke_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\ARM\Release\Ice_objects_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\Win32\Release\Ice_invoke_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\ARM\Release\Ice_operations_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\client\Win32\Release\Ice_location_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\ARM\Release\Ice_operations_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\server\Win32\Release\Ice_location_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\ARM\Release\Ice_operations_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\Win32\Release\Ice_metrics_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\ARM\Release\Ice_operations_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\Win32\Release\Ice_metrics_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\ARM\Release\Ice_proxy_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\Win32\Release\Ice_metrics_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\ARM\Release\Ice_proxy_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Release\Ice_metrics_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\ARM\Release\Ice_proxy_serveramd.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\Win32\Release\Ice_networkProxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\ARM\Release\Ice_proxy_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\Win32\Release\Ice_networkProxy_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\ARM\Release\Ice_retry_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Release\Ice_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\ARM\Release\Ice_retry_collocated.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\Win32\Release\Ice_objects_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\ARM\Release\Ice_retry_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\Win32\Release\Ice_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\ARM\Release\Ice_stream_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\Win32\Release\Ice_operations_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\ARM\Release\Ice_timeout_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\Win32\Release\Ice_operations_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\ARM\Release\Ice_timeout_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\Win32\Release\Ice_operations_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\ARM\Release\Ice_udp_client.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Release\Ice_operations_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\ARM\Release\Ice_udp_server.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Release\Ice_optional_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Release\Ice_optional_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Release\Ice_optional_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Release\Ice_proxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\Win32\Release\Ice_proxy_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\Win32\Release\Ice_proxy_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\Win32\Release\Ice_proxy_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\Win32\Release\Ice_retry_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\Win32\Release\Ice_retry_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Release\Ice_retry_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\Win32\Release\Ice_servantLocator_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\Win32\Release\Ice_servantLocator_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\Win32\Release\Ice_servantLocator_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\Win32\Release\Ice_servantLocator_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\Win32\Release\Ice_services_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\Win32\Release\Ice_slicing_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\Win32\Release\Ice_slicing_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\Win32\Release\Ice_slicing_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\Win32\Release\Ice_slicing_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\Win32\Release\Ice_slicing_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\Win32\Release\Ice_slicing_objects_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Release\Ice_stream_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\Win32\Release\Ice_stringConverter_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\Win32\Release\Ice_stringConverter_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Release\Ice_timeout_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Release\Ice_timeout_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Release\Ice_udp_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Release\Ice_udp_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Debug\Ice_acm_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\Win32\Debug\Ice_acm_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\Win32\Debug\Ice_adapterDeactivation_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\Win32\Debug\Ice_adapterDeactivation_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\Win32\Debug\Ice_adapterDeactivation_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\Win32\Debug\Ice_admin_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\Win32\Debug\Ice_admin_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\Win32\Debug\Ice_ami_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\Win32\Debug\Ice_ami_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\Win32\Debug\Ice_ami_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\Win32\Debug\Ice_binding_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Debug\Ice_binding_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Debug\Ice_checksum_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Debug\Ice_checksum_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Debug\Ice_custom_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\Win32\Debug\Ice_custom_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\Win32\Debug\Ice_custom_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\Win32\Debug\Ice_custom_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\Win32\Debug\Ice_defaultServant_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\Win32\Debug\Ice_defaultValue_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Debug\Ice_dispatcher_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\Win32\Debug\Ice_dispatcher_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\Win32\Debug\Ice_dispatcher_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\Win32\Debug\Ice_enums_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\Win32\Debug\Ice_enums_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\Win32\Debug\Ice_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\Win32\Debug\Ice_exceptions_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\Win32\Debug\Ice_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\Win32\Debug\Ice_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\Win32\Debug\Ice_facets_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\Win32\Debug\Ice_facets_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\Win32\Debug\Ice_facets_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\Win32\Debug\Ice_hash_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\Win32\Debug\Ice_hold_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\Win32\Debug\Ice_hold_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\client\Win32\Debug\Ice_info_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\server\Win32\Debug\Ice_info_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\Win32\Debug\Ice_inheritance_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\Win32\Debug\Ice_inheritance_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Debug\Ice_inheritance_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\Win32\Debug\Ice_interceptor_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Debug\Ice_invoke_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\Win32\Debug\Ice_invoke_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\client\Win32\Debug\Ice_location_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\server\Win32\Debug\Ice_location_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\Win32\Debug\Ice_metrics_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\Win32\Debug\Ice_metrics_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\Win32\Debug\Ice_metrics_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Debug\Ice_metrics_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\Win32\Debug\Ice_networkProxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\Win32\Debug\Ice_networkProxy_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Debug\Ice_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\Win32\Debug\Ice_objects_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\Win32\Debug\Ice_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\Win32\Debug\Ice_operations_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\Win32\Debug\Ice_operations_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\Win32\Debug\Ice_operations_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Debug\Ice_operations_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Debug\Ice_optional_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Debug\Ice_optional_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Debug\Ice_optional_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Debug\Ice_proxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\Win32\Debug\Ice_proxy_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\Win32\Debug\Ice_proxy_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\Win32\Debug\Ice_proxy_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\Win32\Debug\Ice_retry_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\Win32\Debug\Ice_retry_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Debug\Ice_retry_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\Win32\Debug\Ice_servantLocator_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\Win32\Debug\Ice_servantLocator_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\Win32\Debug\Ice_servantLocator_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\Win32\Debug\Ice_servantLocator_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\Win32\Debug\Ice_services_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\Win32\Debug\Ice_slicing_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\Win32\Debug\Ice_slicing_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\Win32\Debug\Ice_slicing_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\Win32\Debug\Ice_slicing_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\Win32\Debug\Ice_slicing_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\Win32\Debug\Ice_slicing_objects_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Debug\Ice_stream_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\Win32\Debug\Ice_stringConverter_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\Win32\Debug\Ice_stringConverter_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Debug\Ice_timeout_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Debug\Ice_timeout_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Debug\Ice_udp_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Debug\Ice_udp_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
     <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Debug\Ice_acm_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
@@ -1318,6 +1399,30 @@
     <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Debug\Ice_binding_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Debug\Ice_checksum_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Debug\Ice_checksum_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Debug\Ice_custom_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\ARM\Debug\Ice_custom_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\ARM\Debug\Ice_custom_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\ARM\Debug\Ice_custom_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\ARM\Debug\Ice_defaultServant_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\ARM\Debug\Ice_defaultValue_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\ARM\Debug\Ice_dispatcher_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
@@ -1339,10 +1444,10 @@
     <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\ARM\Debug\Ice_exceptions_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\ARM\Debug\Ice_exceptions_serveramd.dll">
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\ARM\Debug\Ice_exceptions_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\ARM\Debug\Ice_exceptions_server.dll">
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\ARM\Debug\Ice_exceptions_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\facets\msbuild\uwp\client\ARM\Debug\Ice_facets_client.dll">
@@ -1378,6 +1483,9 @@
     <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\ARM\Debug\Ice_inheritance_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\ARM\Debug\Ice_interceptor_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\ARM\Debug\Ice_invoke_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
@@ -1396,10 +1504,16 @@
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\ARM\Debug\Ice_metrics_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\ARM\Debug\Ice_metrics_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\ARM\Debug\Ice_metrics_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\ARM\Debug\Ice_metrics_server.dll">
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\ARM\Debug\Ice_networkProxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\ARM\Debug\Ice_networkProxy_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\objects\msbuild\uwp\client\ARM\Debug\Ice_objects_client.dll">
@@ -1417,10 +1531,19 @@
     <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\ARM\Debug\Ice_operations_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\ARM\Debug\Ice_operations_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\ARM\Debug\Ice_operations_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\ARM\Debug\Ice_operations_server.dll">
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Debug\Ice_optional_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Debug\Ice_optional_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Debug\Ice_optional_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\ARM\Debug\Ice_proxy_client.dll">
@@ -1429,10 +1552,10 @@
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\ARM\Debug\Ice_proxy_collocated.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\ARM\Debug\Ice_proxy_serveramd.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\ARM\Debug\Ice_proxy_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\ARM\Debug\Ice_proxy_server.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\ARM\Debug\Ice_proxy_serveramd.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
     <None Include="..\..\..\Ice\retry\msbuild\uwp\client\ARM\Debug\Ice_retry_client.dll">
@@ -1444,9 +1567,48 @@
     <None Include="..\..\..\Ice\retry\msbuild\uwp\server\ARM\Debug\Ice_retry_server.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\ARM\Debug\Ice_servantLocator_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\ARM\Debug\Ice_servantLocator_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\ARM\Debug\Ice_servantLocator_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\ARM\Debug\Ice_servantLocator_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\ARM\Debug\Ice_services_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\ARM\Debug\Ice_slicing_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\ARM\Debug\Ice_slicing_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\ARM\Debug\Ice_slicing_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\ARM\Debug\Ice_slicing_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\ARM\Debug\Ice_slicing_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\ARM\Debug\Ice_slicing_objects_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\stream\msbuild\uwp\ARM\Debug\Ice_stream_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\ARM\Debug\Ice_stringConverter_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\ARM\Debug\Ice_stringConverter_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+    </None>
     <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\ARM\Debug\Ice_timeout_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
@@ -1460,6 +1622,266 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Release\Ice_acm_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\ARM\Release\Ice_acm_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\ARM\Release\Ice_adapterDeactivation_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\ARM\Release\Ice_adapterDeactivation_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\ARM\Release\Ice_adapterDeactivation_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\ARM\Release\Ice_admin_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\ARM\Release\Ice_admin_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\ARM\Release\Ice_ami_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\ARM\Release\Ice_ami_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\ARM\Release\Ice_ami_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\ARM\Release\Ice_binding_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Release\Ice_binding_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Release\Ice_checksum_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Release\Ice_checksum_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Release\Ice_custom_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\ARM\Release\Ice_custom_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\ARM\Release\Ice_custom_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\ARM\Release\Ice_custom_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\ARM\Release\Ice_defaultServant_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\ARM\Release\Ice_defaultValue_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\ARM\Release\Ice_dispatcher_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\ARM\Release\Ice_dispatcher_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\ARM\Release\Ice_dispatcher_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\ARM\Release\Ice_enums_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\ARM\Release\Ice_enums_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\ARM\Release\Ice_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\ARM\Release\Ice_exceptions_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\ARM\Release\Ice_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\ARM\Release\Ice_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\ARM\Release\Ice_facets_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\ARM\Release\Ice_facets_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\ARM\Release\Ice_facets_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\ARM\Release\Ice_hash_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\ARM\Release\Ice_hold_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\ARM\Release\Ice_hold_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\client\ARM\Release\Ice_info_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\server\ARM\Release\Ice_info_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\ARM\Release\Ice_inheritance_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\ARM\Release\Ice_inheritance_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\ARM\Release\Ice_inheritance_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\ARM\Release\Ice_interceptor_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\ARM\Release\Ice_invoke_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\ARM\Release\Ice_invoke_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\client\ARM\Release\Ice_location_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\server\ARM\Release\Ice_location_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\ARM\Release\Ice_metrics_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\ARM\Release\Ice_metrics_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\ARM\Release\Ice_metrics_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\ARM\Release\Ice_metrics_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\ARM\Release\Ice_networkProxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\ARM\Release\Ice_networkProxy_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\ARM\Release\Ice_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\ARM\Release\Ice_objects_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\ARM\Release\Ice_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\ARM\Release\Ice_operations_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\ARM\Release\Ice_operations_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\ARM\Release\Ice_operations_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\ARM\Release\Ice_operations_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Release\Ice_optional_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Release\Ice_optional_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Release\Ice_optional_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\ARM\Release\Ice_proxy_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\ARM\Release\Ice_proxy_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\ARM\Release\Ice_proxy_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\ARM\Release\Ice_proxy_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\ARM\Release\Ice_retry_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\ARM\Release\Ice_retry_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\ARM\Release\Ice_retry_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\ARM\Release\Ice_servantLocator_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\ARM\Release\Ice_servantLocator_collocated.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\ARM\Release\Ice_servantLocator_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\ARM\Release\Ice_servantLocator_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\ARM\Release\Ice_services_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\ARM\Release\Ice_slicing_exceptions_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\ARM\Release\Ice_slicing_exceptions_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\ARM\Release\Ice_slicing_exceptions_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\ARM\Release\Ice_slicing_objects_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\ARM\Release\Ice_slicing_objects_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\ARM\Release\Ice_slicing_objects_serveramd.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\ARM\Release\Ice_stream_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\ARM\Release\Ice_stringConverter_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\ARM\Release\Ice_stringConverter_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\ARM\Release\Ice_timeout_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\ARM\Release\Ice_timeout_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\ARM\Release\Ice_udp_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\ARM\Release\Ice_udp_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+    </None>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
index 9a5a3d5e7d1..47b2c0ee74c 100644
--- a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
+++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
@@ -188,16 +188,53 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Debug\Ice_proxy_client.dll">
-      <Filter>Tests\x64\Debug</Filter>
+    <None Include="..\..\..\..\..\certs\cacert.der">
+      <Filter>certs</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Debug\Ice_proxy_server.dll">
-      <Filter>Tests\x64\Debug</Filter>
+    <None Include="..\..\..\..\..\certs\client.p12">
+      <Filter>certs</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Debug\Ice_proxy_collocated.dll">
+    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1.p12">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1_exp.p12">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1_exp_pub.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1_pub.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\c_rsa_ca2.p12">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\c_rsa_cai2.p12">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\c_rsa_pass_ca1.p12">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\cacert1.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\cacert2.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\cacerts.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_exp_pub.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_pub.pem">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="controller_TemporaryKey.pfx" />
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Debug\Ice_acm_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Debug\Ice_proxy_serveramd.dll">
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\x64\Debug\Ice_acm_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
     <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\x64\Debug\Ice_adapterDeactivation_client.dll">
@@ -209,6 +246,12 @@
     <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\x64\Debug\Ice_adapterDeactivation_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\x64\Debug\Ice_admin_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\x64\Debug\Ice_admin_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\ami\msbuild\uwp\client\x64\Debug\Ice_ami_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
@@ -224,6 +267,30 @@
     <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Debug\Ice_binding_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Debug\Ice_checksum_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Debug\Ice_checksum_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Debug\Ice_custom_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\x64\Debug\Ice_custom_collocated.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\x64\Debug\Ice_custom_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\x64\Debug\Ice_custom_serveramd.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\x64\Debug\Ice_defaultServant_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\x64\Debug\Ice_defaultValue_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\x64\Debug\Ice_dispatcher_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
@@ -233,6 +300,12 @@
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\x64\Debug\Ice_dispatcher_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\x64\Debug\Ice_enums_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\x64\Debug\Ice_enums_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\x64\Debug\Ice_exceptions_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
@@ -248,10 +321,13 @@
     <None Include="..\..\..\Ice\facets\msbuild\uwp\client\x64\Debug\Ice_facets_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\x64\Debug\Ice_facets_collocated.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\facets\msbuild\uwp\server\x64\Debug\Ice_facets_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\x64\Debug\Ice_facets_collocated.dll">
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\x64\Debug\Ice_hash_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
     <None Include="..\..\..\Ice\hold\msbuild\uwp\client\x64\Debug\Ice_hold_client.dll">
@@ -275,6 +351,9 @@
     <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\x64\Debug\Ice_inheritance_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\x64\Debug\Ice_interceptor_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\x64\Debug\Ice_invoke_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
@@ -287,6 +366,24 @@
     <None Include="..\..\..\Ice\location\msbuild\uwp\server\x64\Debug\Ice_location_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\x64\Debug\Ice_metrics_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Debug\Ice_metrics_collocated.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Debug\Ice_metrics_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Debug\Ice_metrics_serveramd.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\x64\Debug\Ice_networkProxy_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\x64\Debug\Ice_networkProxy_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\objects\msbuild\uwp\client\x64\Debug\Ice_objects_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
@@ -308,410 +405,347 @@
     <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\x64\Debug\Ice_operations_serveramd.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Debug\Ice_retry_client.dll">
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Debug\Ice_optional_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Debug\Ice_retry_server.dll">
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Debug\Ice_optional_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\x64\Debug\Ice_retry_collocated.dll">
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Debug\Ice_optional_serveramd.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\x64\Debug\Ice_stream_client.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Debug\Ice_proxy_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Debug\Ice_timeout_client.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Debug\Ice_proxy_collocated.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\x64\Debug\Ice_timeout_server.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Debug\Ice_proxy_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Debug\Ice_acm_client.dll">
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Debug\Ice_proxy_serveramd.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\x64\Debug\Ice_acm_server.dll">
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Debug\Ice_retry_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\x64\Debug\Ice_udp_client.dll">
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\x64\Debug\Ice_retry_collocated.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Debug\Ice_udp_server.dll">
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Debug\Ice_retry_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\x64\Debug\Ice_hash_client.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\x64\Debug\Ice_servantLocator_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\x64\Debug\Ice_admin_server.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\x64\Debug\Ice_servantLocator_collocated.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\x64\Debug\Ice_admin_client.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\x64\Debug\Ice_servantLocator_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\x64\Debug\Ice_enums_server.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\x64\Debug\Ice_servantLocator_serveramd.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\x64\Debug\Ice_enums_client.dll">
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\x64\Debug\Ice_services_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\x64\Debug\Ice_metrics_client.dll">
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\x64\Debug\Ice_slicing_exceptions_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Debug\Ice_metrics_server.dll">
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\x64\Debug\Ice_slicing_exceptions_server.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Debug\Ice_metrics_serveramd.dll">
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\x64\Debug\Ice_slicing_exceptions_serveramd.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Debug\Ice_metrics_collocated.dll">
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\x64\Debug\Ice_slicing_objects_client.dll">
       <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Debug\Ice_acm_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\x64\Debug\Ice_acm_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\x64\Debug\Ice_adapterDeactivation_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\x64\Debug\Ice_adapterDeactivation_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\x64\Debug\Ice_adapterDeactivation_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\x64\Debug\Ice_admin_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\x64\Debug\Ice_admin_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\x64\Debug\Ice_ami_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\x64\Debug\Ice_ami_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\x64\Debug\Ice_ami_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\x64\Debug\Ice_binding_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Debug\Ice_binding_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\x64\Debug\Ice_dispatcher_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\x64\Debug\Ice_dispatcher_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\x64\Debug\Ice_dispatcher_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\x64\Debug\Ice_enums_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\x64\Debug\Ice_enums_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\x64\Debug\Ice_exceptions_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\x64\Debug\Ice_exceptions_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Debug\Ice_exceptions_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Debug\Ice_exceptions_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\x64\Debug\Ice_facets_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\x64\Debug\Ice_slicing_objects_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\x64\Debug\Ice_facets_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\x64\Debug\Ice_slicing_objects_serveramd.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\x64\Debug\Ice_facets_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\x64\Debug\Ice_stream_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\Win32\Debug\Ice_hash_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\x64\Debug\Ice_stringConverter_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\x64\Debug\Ice_hold_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\x64\Debug\Ice_stringConverter_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\x64\Debug\Ice_hold_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Debug\Ice_timeout_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\x64\Debug\Ice_info_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\x64\Debug\Ice_timeout_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\x64\Debug\Ice_info_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\x64\Debug\Ice_udp_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\x64\Debug\Ice_inheritance_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Debug\Ice_udp_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\x64\Debug\Ice_inheritance_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Release\Ice_acm_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\x64\Debug\Ice_inheritance_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\x64\Release\Ice_acm_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\x64\Debug\Ice_invoke_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\x64\Release\Ice_adapterDeactivation_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\x64\Debug\Ice_invoke_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\x64\Release\Ice_adapterDeactivation_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\x64\Debug\Ice_location_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\x64\Release\Ice_adapterDeactivation_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\x64\Debug\Ice_location_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\x64\Release\Ice_admin_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\x64\Debug\Ice_metrics_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\x64\Release\Ice_admin_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Debug\Ice_metrics_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\x64\Release\Ice_ami_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Debug\Ice_metrics_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\x64\Release\Ice_ami_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Debug\Ice_metrics_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\x64\Release\Ice_ami_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\x64\Debug\Ice_objects_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\x64\Release\Ice_binding_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\x64\Debug\Ice_objects_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Release\Ice_binding_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\x64\Debug\Ice_objects_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Release\Ice_checksum_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\x64\Debug\Ice_operations_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Release\Ice_checksum_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\x64\Debug\Ice_operations_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Release\Ice_custom_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Debug\Ice_operations_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\x64\Release\Ice_custom_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\x64\Debug\Ice_operations_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\x64\Release\Ice_custom_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Debug\Ice_proxy_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\x64\Release\Ice_custom_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Debug\Ice_proxy_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\x64\Release\Ice_defaultServant_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Debug\Ice_proxy_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\x64\Release\Ice_defaultValue_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Debug\Ice_proxy_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\x64\Release\Ice_dispatcher_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Debug\Ice_retry_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\x64\Release\Ice_dispatcher_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\x64\Debug\Ice_retry_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\x64\Release\Ice_dispatcher_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Debug\Ice_retry_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\x64\Release\Ice_enums_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Debug\Ice_stream_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\x64\Release\Ice_enums_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Debug\Ice_timeout_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\x64\Release\Ice_exceptions_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\x64\Debug\Ice_timeout_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\x64\Release\Ice_exceptions_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\x64\Debug\Ice_udp_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Release\Ice_exceptions_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Debug\Ice_udp_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Release\Ice_exceptions_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Debug\Ice_acm_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\x64\Release\Ice_facets_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\Win32\Debug\Ice_acm_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\x64\Release\Ice_facets_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\Win32\Debug\Ice_adapterDeactivation_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\x64\Release\Ice_facets_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\Win32\Debug\Ice_adapterDeactivation_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\x64\Release\Ice_hash_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\Win32\Debug\Ice_adapterDeactivation_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\x64\Release\Ice_hold_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\Win32\Debug\Ice_admin_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\x64\Release\Ice_hold_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\Win32\Debug\Ice_admin_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\client\x64\Release\Ice_info_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\Win32\Debug\Ice_ami_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\server\x64\Release\Ice_info_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\Win32\Debug\Ice_ami_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\x64\Release\Ice_inheritance_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\Win32\Debug\Ice_ami_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\x64\Release\Ice_inheritance_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\Win32\Debug\Ice_binding_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\x64\Release\Ice_inheritance_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Debug\Ice_binding_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\x64\Release\Ice_interceptor_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Debug\Ice_dispatcher_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\x64\Release\Ice_invoke_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\Win32\Debug\Ice_dispatcher_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\x64\Release\Ice_invoke_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\Win32\Debug\Ice_dispatcher_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\client\x64\Release\Ice_location_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\Win32\Debug\Ice_enums_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\server\x64\Release\Ice_location_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\Win32\Debug\Ice_enums_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\x64\Release\Ice_metrics_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\Win32\Debug\Ice_exceptions_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Release\Ice_metrics_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\Win32\Debug\Ice_exceptions_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Release\Ice_metrics_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\Win32\Debug\Ice_exceptions_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Release\Ice_metrics_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\Win32\Debug\Ice_exceptions_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\x64\Release\Ice_networkProxy_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\Win32\Debug\Ice_facets_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\x64\Release\Ice_networkProxy_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\Win32\Debug\Ice_facets_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\x64\Release\Ice_objects_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\Win32\Debug\Ice_facets_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\x64\Release\Ice_objects_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\Win32\Debug\Ice_hold_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\x64\Release\Ice_objects_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\Win32\Debug\Ice_hold_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\x64\Release\Ice_operations_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\Win32\Debug\Ice_info_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\x64\Release\Ice_operations_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\Win32\Debug\Ice_info_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Release\Ice_operations_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\Win32\Debug\Ice_inheritance_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\x64\Release\Ice_operations_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\Win32\Debug\Ice_inheritance_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Release\Ice_optional_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Debug\Ice_inheritance_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Release\Ice_optional_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Debug\Ice_invoke_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Release\Ice_optional_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\Win32\Debug\Ice_invoke_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Release\Ice_proxy_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\Win32\Debug\Ice_location_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Release\Ice_proxy_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\Win32\Debug\Ice_location_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Release\Ice_proxy_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\Win32\Debug\Ice_metrics_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Release\Ice_proxy_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\Win32\Debug\Ice_metrics_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Release\Ice_retry_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\Win32\Debug\Ice_metrics_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\x64\Release\Ice_retry_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Debug\Ice_metrics_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Release\Ice_retry_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Debug\Ice_objects_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\x64\Release\Ice_servantLocator_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\Win32\Debug\Ice_objects_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\x64\Release\Ice_servantLocator_collocated.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\Win32\Debug\Ice_objects_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\x64\Release\Ice_servantLocator_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\Win32\Debug\Ice_operations_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\x64\Release\Ice_servantLocator_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\Win32\Debug\Ice_operations_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\x64\Release\Ice_services_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\Win32\Debug\Ice_operations_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\x64\Release\Ice_slicing_exceptions_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Debug\Ice_operations_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\x64\Release\Ice_slicing_exceptions_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Debug\Ice_proxy_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\x64\Release\Ice_slicing_exceptions_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\Win32\Debug\Ice_proxy_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\x64\Release\Ice_slicing_objects_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\Win32\Debug\Ice_proxy_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\x64\Release\Ice_slicing_objects_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\Win32\Debug\Ice_proxy_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\x64\Release\Ice_slicing_objects_serveramd.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\Win32\Debug\Ice_retry_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\x64\Release\Ice_stream_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\Win32\Debug\Ice_retry_collocated.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\x64\Release\Ice_stringConverter_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Debug\Ice_retry_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\x64\Release\Ice_stringConverter_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Debug\Ice_timeout_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Release\Ice_timeout_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Debug\Ice_timeout_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\x64\Release\Ice_timeout_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Debug\Ice_udp_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\x64\Release\Ice_udp_client.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Debug\Ice_udp_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Release\Ice_udp_server.dll">
+      <Filter>Tests\x64\Release</Filter>
     </None>
     <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Release\Ice_acm_client.dll">
       <Filter>Tests\Win32\Release</Filter>
@@ -749,6 +783,30 @@
     <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Release\Ice_binding_server.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Release\Ice_checksum_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Release\Ice_checksum_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Release\Ice_custom_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\Win32\Release\Ice_custom_collocated.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\Win32\Release\Ice_custom_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\Win32\Release\Ice_custom_serveramd.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\Win32\Release\Ice_defaultServant_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\Win32\Release\Ice_defaultValue_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Release\Ice_dispatcher_client.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
@@ -809,6 +867,9 @@
     <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Release\Ice_inheritance_server.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\Win32\Release\Ice_interceptor_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
     <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Release\Ice_invoke_client.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
@@ -833,6 +894,12 @@
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Release\Ice_metrics_serveramd.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\Win32\Release\Ice_networkProxy_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\Win32\Release\Ice_networkProxy_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
     <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Release\Ice_objects_client.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
@@ -854,6 +921,15 @@
     <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Release\Ice_operations_serveramd.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Release\Ice_optional_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Release\Ice_optional_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Release\Ice_optional_serveramd.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Release\Ice_proxy_client.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
@@ -875,376 +951,319 @@
     <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Release\Ice_retry_server.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Release\Ice_stream_client.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\Win32\Release\Ice_servantLocator_client.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Release\Ice_timeout_client.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\Win32\Release\Ice_servantLocator_collocated.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Release\Ice_timeout_server.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\Win32\Release\Ice_servantLocator_server.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Release\Ice_udp_client.dll">
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\Win32\Release\Ice_servantLocator_serveramd.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Release\Ice_udp_server.dll">
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\Win32\Release\Ice_services_client.dll">
       <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\x64\Release\Ice_acm_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\x64\Release\Ice_acm_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\x64\Release\Ice_adapterDeactivation_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\x64\Release\Ice_adapterDeactivation_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\x64\Release\Ice_adapterDeactivation_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\x64\Release\Ice_admin_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\x64\Release\Ice_admin_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\x64\Release\Ice_ami_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\x64\Release\Ice_ami_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\x64\Release\Ice_ami_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\x64\Release\Ice_binding_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Release\Ice_binding_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\x64\Release\Ice_dispatcher_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\x64\Release\Ice_dispatcher_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\x64\Release\Ice_dispatcher_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\x64\Release\Ice_enums_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\x64\Release\Ice_enums_server.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\x64\Release\Ice_exceptions_client.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\x64\Release\Ice_exceptions_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\x64\Release\Ice_exceptions_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\Win32\Release\Ice_slicing_exceptions_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\x64\Release\Ice_exceptions_serveramd.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\Win32\Release\Ice_slicing_exceptions_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\x64\Release\Ice_facets_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\Win32\Release\Ice_slicing_exceptions_serveramd.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\x64\Release\Ice_facets_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\Win32\Release\Ice_slicing_objects_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\x64\Release\Ice_facets_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\Win32\Release\Ice_slicing_objects_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\x64\Release\Ice_hash_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\Win32\Release\Ice_slicing_objects_serveramd.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\x64\Release\Ice_hold_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Release\Ice_stream_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\x64\Release\Ice_hold_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\Win32\Release\Ice_stringConverter_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\x64\Release\Ice_info_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\Win32\Release\Ice_stringConverter_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\x64\Release\Ice_info_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Release\Ice_timeout_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\x64\Release\Ice_inheritance_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Release\Ice_timeout_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\x64\Release\Ice_inheritance_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Release\Ice_udp_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\x64\Release\Ice_inheritance_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Release\Ice_udp_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\x64\Release\Ice_invoke_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\Win32\Debug\Ice_acm_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\x64\Release\Ice_invoke_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\Win32\Debug\Ice_acm_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\x64\Release\Ice_location_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\Win32\Debug\Ice_adapterDeactivation_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\x64\Release\Ice_location_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\Win32\Debug\Ice_adapterDeactivation_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\x64\Release\Ice_metrics_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\Win32\Debug\Ice_adapterDeactivation_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\x64\Release\Ice_metrics_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\Win32\Debug\Ice_admin_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\x64\Release\Ice_metrics_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\Win32\Debug\Ice_admin_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\x64\Release\Ice_metrics_serveramd.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\Win32\Debug\Ice_ami_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\x64\Release\Ice_objects_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\Win32\Debug\Ice_ami_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\x64\Release\Ice_objects_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\Win32\Debug\Ice_ami_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\x64\Release\Ice_objects_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\Win32\Debug\Ice_binding_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\x64\Release\Ice_operations_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Debug\Ice_binding_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\x64\Release\Ice_operations_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Debug\Ice_checksum_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\x64\Release\Ice_operations_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Debug\Ice_checksum_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\x64\Release\Ice_operations_serveramd.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Debug\Ice_custom_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\x64\Release\Ice_proxy_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\Win32\Debug\Ice_custom_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\x64\Release\Ice_proxy_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\Win32\Debug\Ice_custom_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\x64\Release\Ice_proxy_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\Win32\Debug\Ice_custom_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\x64\Release\Ice_proxy_serveramd.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\Win32\Debug\Ice_defaultServant_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\x64\Release\Ice_retry_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\Win32\Debug\Ice_defaultValue_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\x64\Release\Ice_retry_collocated.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\Win32\Debug\Ice_dispatcher_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\x64\Release\Ice_retry_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\Win32\Debug\Ice_dispatcher_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\x64\Release\Ice_stream_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\Win32\Debug\Ice_dispatcher_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\x64\Release\Ice_timeout_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\Win32\Debug\Ice_enums_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\x64\Release\Ice_timeout_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\Win32\Debug\Ice_enums_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\x64\Release\Ice_udp_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\Win32\Debug\Ice_exceptions_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\x64\Release\Ice_udp_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\Win32\Debug\Ice_exceptions_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Release\Ice_acm_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\Win32\Debug\Ice_exceptions_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\ARM\Release\Ice_acm_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\Win32\Debug\Ice_exceptions_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\ARM\Release\Ice_adapterDeactivation_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\Win32\Debug\Ice_facets_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\ARM\Release\Ice_adapterDeactivation_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\Win32\Debug\Ice_facets_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\ARM\Release\Ice_adapterDeactivation_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\Win32\Debug\Ice_facets_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\ARM\Release\Ice_admin_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\Win32\Debug\Ice_hash_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\ARM\Release\Ice_admin_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\Win32\Debug\Ice_hold_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\ARM\Release\Ice_ami_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\Win32\Debug\Ice_hold_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\ARM\Release\Ice_ami_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\client\Win32\Debug\Ice_info_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\ARM\Release\Ice_ami_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\server\Win32\Debug\Ice_info_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\ARM\Release\Ice_binding_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\Win32\Debug\Ice_inheritance_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Release\Ice_binding_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\Win32\Debug\Ice_inheritance_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\ARM\Release\Ice_dispatcher_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\Win32\Debug\Ice_inheritance_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\ARM\Release\Ice_dispatcher_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\Win32\Debug\Ice_interceptor_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\ARM\Release\Ice_dispatcher_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\Win32\Debug\Ice_invoke_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\ARM\Release\Ice_enums_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\Win32\Debug\Ice_invoke_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\ARM\Release\Ice_enums_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\client\Win32\Debug\Ice_location_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\ARM\Release\Ice_exceptions_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\server\Win32\Debug\Ice_location_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\ARM\Release\Ice_exceptions_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\Win32\Debug\Ice_metrics_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\ARM\Release\Ice_exceptions_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\Win32\Debug\Ice_metrics_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\ARM\Release\Ice_exceptions_serveramd.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\Win32\Debug\Ice_metrics_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\ARM\Release\Ice_facets_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\Win32\Debug\Ice_metrics_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\ARM\Release\Ice_facets_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\Win32\Debug\Ice_networkProxy_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\ARM\Release\Ice_facets_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\Win32\Debug\Ice_networkProxy_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hash\msbuild\uwp\ARM\Release\Ice_hash_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\Win32\Debug\Ice_objects_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\ARM\Release\Ice_hold_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\Win32\Debug\Ice_objects_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\ARM\Release\Ice_hold_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\Win32\Debug\Ice_objects_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\client\ARM\Release\Ice_info_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\Win32\Debug\Ice_operations_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\info\msbuild\uwp\server\ARM\Release\Ice_info_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\Win32\Debug\Ice_operations_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\ARM\Release\Ice_inheritance_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\Win32\Debug\Ice_operations_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\ARM\Release\Ice_inheritance_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\Win32\Debug\Ice_operations_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\ARM\Release\Ice_inheritance_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Debug\Ice_optional_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\ARM\Release\Ice_invoke_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Debug\Ice_optional_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\ARM\Release\Ice_invoke_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Debug\Ice_optional_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\client\ARM\Release\Ice_location_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\Win32\Debug\Ice_proxy_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\location\msbuild\uwp\server\ARM\Release\Ice_location_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\Win32\Debug\Ice_proxy_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\ARM\Release\Ice_metrics_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\Win32\Debug\Ice_proxy_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\ARM\Release\Ice_metrics_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\Win32\Debug\Ice_proxy_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\ARM\Release\Ice_metrics_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\Win32\Debug\Ice_retry_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\ARM\Release\Ice_metrics_serveramd.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\Win32\Debug\Ice_retry_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\ARM\Release\Ice_objects_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\Win32\Debug\Ice_retry_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\ARM\Release\Ice_objects_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\Win32\Debug\Ice_servantLocator_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\ARM\Release\Ice_objects_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\Win32\Debug\Ice_servantLocator_collocated.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\ARM\Release\Ice_operations_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\Win32\Debug\Ice_servantLocator_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\ARM\Release\Ice_operations_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\Win32\Debug\Ice_servantLocator_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\ARM\Release\Ice_operations_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\Win32\Debug\Ice_services_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\ARM\Release\Ice_operations_serveramd.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\Win32\Debug\Ice_slicing_exceptions_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\ARM\Release\Ice_proxy_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\Win32\Debug\Ice_slicing_exceptions_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\ARM\Release\Ice_proxy_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\Win32\Debug\Ice_slicing_exceptions_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\ARM\Release\Ice_proxy_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\Win32\Debug\Ice_slicing_objects_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\ARM\Release\Ice_proxy_serveramd.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\Win32\Debug\Ice_slicing_objects_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\ARM\Release\Ice_retry_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\Win32\Debug\Ice_slicing_objects_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\ARM\Release\Ice_retry_collocated.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\Win32\Debug\Ice_stream_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\ARM\Release\Ice_retry_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\Win32\Debug\Ice_stringConverter_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\stream\msbuild\uwp\ARM\Release\Ice_stream_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\Win32\Debug\Ice_stringConverter_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\ARM\Release\Ice_timeout_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\Win32\Debug\Ice_timeout_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\ARM\Release\Ice_timeout_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\Win32\Debug\Ice_timeout_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\ARM\Release\Ice_udp_client.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\Win32\Debug\Ice_udp_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\ARM\Release\Ice_udp_server.dll">
-      <Filter>Tests\ARM\Release</Filter>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\Win32\Debug\Ice_udp_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Debug\Ice_acm_client.dll">
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\ARM\Debug\Ice_udp_server.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
     <None Include="..\..\..\Ice\acm\msbuild\uwp\server\ARM\Debug\Ice_acm_server.dll">
@@ -1280,6 +1299,30 @@
     <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Debug\Ice_binding_server.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Debug\Ice_checksum_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Debug\Ice_checksum_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Debug\Ice_custom_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\ARM\Debug\Ice_custom_collocated.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\ARM\Debug\Ice_custom_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\ARM\Debug\Ice_custom_serveramd.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\ARM\Debug\Ice_defaultServant_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\ARM\Debug\Ice_defaultValue_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\ARM\Debug\Ice_dispatcher_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
@@ -1340,6 +1383,9 @@
     <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\ARM\Debug\Ice_inheritance_server.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\ARM\Debug\Ice_interceptor_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\ARM\Debug\Ice_invoke_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
@@ -1364,6 +1410,12 @@
     <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\ARM\Debug\Ice_metrics_serveramd.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\ARM\Debug\Ice_networkProxy_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\ARM\Debug\Ice_networkProxy_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\objects\msbuild\uwp\client\ARM\Debug\Ice_objects_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
@@ -1385,6 +1437,15 @@
     <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\ARM\Debug\Ice_operations_serveramd.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Debug\Ice_optional_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Debug\Ice_optional_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Debug\Ice_optional_serveramd.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\ARM\Debug\Ice_proxy_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
@@ -1406,9 +1467,48 @@
     <None Include="..\..\..\Ice\retry\msbuild\uwp\server\ARM\Debug\Ice_retry_server.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\ARM\Debug\Ice_servantLocator_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\ARM\Debug\Ice_servantLocator_collocated.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\ARM\Debug\Ice_servantLocator_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\ARM\Debug\Ice_servantLocator_serveramd.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\ARM\Debug\Ice_services_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\ARM\Debug\Ice_slicing_exceptions_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\ARM\Debug\Ice_slicing_exceptions_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\ARM\Debug\Ice_slicing_exceptions_serveramd.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\ARM\Debug\Ice_slicing_objects_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\ARM\Debug\Ice_slicing_objects_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\ARM\Debug\Ice_slicing_objects_serveramd.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\stream\msbuild\uwp\ARM\Debug\Ice_stream_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\ARM\Debug\Ice_stringConverter_client.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\ARM\Debug\Ice_stringConverter_server.dll">
+      <Filter>Tests\ARM\Debug</Filter>
+    </None>
     <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\ARM\Debug\Ice_timeout_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
@@ -1418,124 +1518,267 @@
     <None Include="..\..\..\Ice\udp\msbuild\uwp\client\ARM\Debug\Ice_udp_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
-    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\ARM\Debug\Ice_udp_server.dll">
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Debug\Ice_acm_client.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\Win32\Debug\IceSSL_configuration_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\client\ARM\Release\Ice_acm_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\Win32\Release\IceSSL_configuration_client.dll">
-      <Filter>Tests\Win32\Release</Filter>
+    <None Include="..\..\..\Ice\acm\msbuild\uwp\server\ARM\Release\Ice_acm_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\x64\Debug\IceSSL_configuration_client.dll">
-      <Filter>Tests\x64\Debug</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\client\ARM\Release\Ice_adapterDeactivation_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\x64\Release\IceSSL_configuration_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\collocated\ARM\Release\Ice_adapterDeactivation_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\ARM\Debug\IceSSL_configuration_client.dll">
-      <Filter>Tests\ARM\Debug</Filter>
+    <None Include="..\..\..\Ice\adapterDeactivation\msbuild\uwp\server\ARM\Release\Ice_adapterDeactivation_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\configuration\msbuild\uwp\client\ARM\Release\IceSSL_configuration_client.dll">
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\client\ARM\Release\Ice_admin_client.dll">
       <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Debug\Ice_optional_client.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\admin\msbuild\uwp\server\ARM\Release\Ice_admin_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Debug\Ice_optional_server.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\client\ARM\Release\Ice_ami_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Debug\Ice_optional_serveramd.dll">
-      <Filter>Tests\Win32\Debug</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\collocated\ARM\Release\Ice_ami_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Release\Ice_optional_serveramd.dll">
-      <Filter>Tests\Win32\Release</Filter>
+    <None Include="..\..\..\Ice\ami\msbuild\uwp\server\ARM\Release\Ice_ami_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\Win32\Release\Ice_optional_server.dll">
-      <Filter>Tests\Win32\Release</Filter>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\client\ARM\Release\Ice_binding_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\Win32\Release\Ice_optional_client.dll">
-      <Filter>Tests\Win32\Release</Filter>
+    <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Release\Ice_binding_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Release\Ice_optional_client.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Release\Ice_checksum_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\x64\Debug\Ice_optional_client.dll">
-      <Filter>Tests\x64\Debug</Filter>
+    <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Release\Ice_checksum_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Release\Ice_optional_client.dll">
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Release\Ice_custom_client.dll">
       <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Debug\Ice_optional_client.dll">
-      <Filter>Tests\ARM\Debug</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\collocated\ARM\Release\Ice_custom_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Debug\Ice_optional_server.dll">
-      <Filter>Tests\ARM\Debug</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\server\ARM\Release\Ice_custom_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Release\Ice_optional_server.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\custom\msbuild\uwp\serveramd\ARM\Release\Ice_custom_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\x64\Debug\Ice_optional_server.dll">
-      <Filter>Tests\x64\Debug</Filter>
+    <None Include="..\..\..\Ice\defaultServant\msbuild\uwp\client\ARM\Release\Ice_defaultServant_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Release\Ice_optional_server.dll">
+    <None Include="..\..\..\Ice\defaultValue\msbuild\uwp\client\ARM\Release\Ice_defaultValue_client.dll">
       <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Debug\Ice_optional_serveramd.dll">
-      <Filter>Tests\x64\Debug</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\client\ARM\Release\Ice_dispatcher_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\x64\Release\Ice_optional_serveramd.dll">
-      <Filter>Tests\x64\Release</Filter>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\collocated\ARM\Release\Ice_dispatcher_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\dispatcher\msbuild\uwp\server\ARM\Release\Ice_dispatcher_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\client\ARM\Release\Ice_enums_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\enums\msbuild\uwp\server\ARM\Release\Ice_enums_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\client\ARM\Release\Ice_exceptions_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\collocated\ARM\Release\Ice_exceptions_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\server\ARM\Release\Ice_exceptions_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\exceptions\msbuild\uwp\serveramd\ARM\Release\Ice_exceptions_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\client\ARM\Release\Ice_facets_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\collocated\ARM\Release\Ice_facets_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\facets\msbuild\uwp\server\ARM\Release\Ice_facets_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\hash\msbuild\uwp\ARM\Release\Ice_hash_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\client\ARM\Release\Ice_hold_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\hold\msbuild\uwp\server\ARM\Release\Ice_hold_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\client\ARM\Release\Ice_info_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\info\msbuild\uwp\server\ARM\Release\Ice_info_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\client\ARM\Release\Ice_inheritance_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\collocated\ARM\Release\Ice_inheritance_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\inheritance\msbuild\uwp\server\ARM\Release\Ice_inheritance_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\interceptor\msbuild\uwp\client\ARM\Release\Ice_interceptor_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\client\ARM\Release\Ice_invoke_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\invoke\msbuild\uwp\server\ARM\Release\Ice_invoke_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\client\ARM\Release\Ice_location_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\location\msbuild\uwp\server\ARM\Release\Ice_location_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\client\ARM\Release\Ice_metrics_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\collocated\ARM\Release\Ice_metrics_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\server\ARM\Release\Ice_metrics_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\metrics\msbuild\uwp\serveramd\ARM\Release\Ice_metrics_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\client\ARM\Release\Ice_networkProxy_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\networkProxy\msbuild\uwp\server\ARM\Release\Ice_networkProxy_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\client\ARM\Release\Ice_objects_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\collocated\ARM\Release\Ice_objects_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\objects\msbuild\uwp\server\ARM\Release\Ice_objects_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\client\ARM\Release\Ice_operations_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\collocated\ARM\Release\Ice_operations_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\server\ARM\Release\Ice_operations_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\operations\msbuild\uwp\serveramd\ARM\Release\Ice_operations_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\client\ARM\Release\Ice_optional_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\optional\msbuild\uwp\server\ARM\Release\Ice_optional_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
     <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Release\Ice_optional_serveramd.dll">
       <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\Ice\optional\msbuild\uwp\serveramd\ARM\Debug\Ice_optional_serveramd.dll">
-      <Filter>Tests\ARM\Debug</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\client\ARM\Release\Ice_proxy_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\..\..\certs\cacert.der">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\collocated\ARM\Release\Ice_proxy_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\..\..\certs\client.p12">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\server\ARM\Release\Ice_proxy_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1.p12">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\proxy\msbuild\uwp\serveramd\ARM\Release\Ice_proxy_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1_exp.p12">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\client\ARM\Release\Ice_retry_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1_exp_pub.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\collocated\ARM\Release\Ice_retry_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_ca1_pub.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\retry\msbuild\uwp\server\ARM\Release\Ice_retry_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_ca2.p12">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\client\ARM\Release\Ice_servantLocator_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_cai2.p12">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\collocated\ARM\Release\Ice_servantLocator_collocated.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\c_rsa_pass_ca1.p12">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\server\ARM\Release\Ice_servantLocator_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\cacert1.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\servantLocator\msbuild\uwp\serveramd\ARM\Release\Ice_servantLocator_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\cacert2.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\services\msbuild\uwp\client\ARM\Release\Ice_services_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\cacerts.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\client\ARM\Release\Ice_slicing_exceptions_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_exp_pub.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\server\ARM\Release\Ice_slicing_exceptions_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_pub.pem">
-      <Filter>certs</Filter>
+    <None Include="..\..\..\Ice\slicing\exceptions\msbuild\uwp\serveramd\ARM\Release\Ice_slicing_exceptions_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\client\ARM\Release\Ice_slicing_objects_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\server\ARM\Release\Ice_slicing_objects_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\slicing\objects\msbuild\uwp\serveramd\ARM\Release\Ice_slicing_objects_serveramd.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\stream\msbuild\uwp\ARM\Release\Ice_stream_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\client\ARM\Release\Ice_stringConverter_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\stringConverter\msbuild\uwp\server\ARM\Release\Ice_stringConverter_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\client\ARM\Release\Ice_timeout_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\timeout\msbuild\uwp\server\ARM\Release\Ice_timeout_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\client\ARM\Release\Ice_udp_client.dll">
+      <Filter>Tests\ARM\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\udp\msbuild\uwp\server\ARM\Release\Ice_udp_server.dll">
+      <Filter>Tests\ARM\Release</Filter>
     </None>
-    <None Include="controller_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <IceBuilder Include="..\..\..\..\..\scripts\Controller.ice">
author	Jose <jose@zeroc.com>	2017-03-24 12:33:33 +0100
committer	Jose <jose@zeroc.com>	2017-03-24 12:33:33 +0100
commit	cdd283db257b308dd2a07171f5d2eb5e9672bc3e (patch)
tree	c4791dc0c68cae3fd5e417f723d5546c8c554758 /cpp/test/uwp/controller
parent	ICE-7680: replace Thread by Runnable (diff)
download	ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.tar.bz2 ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.tar.xz ice-cdd283db257b308dd2a07171f5d2eb5e9672bc3e.zip