UWP test suite updates:

 - Set IceSSL.CertFile when running test suite with SSL/WSS
   protocols.

 - Added missing optional_XXX DLL's to deploy with test suite
   application.

4 files changed, 129 insertions, 4 deletions

diff --git a/cpp/test/uwp/MainPage.xaml.cpp b/cpp/test/uwp/MainPage.xaml.cpp
index b33ea5f98b7..690490859eb 100644
--- a/cpp/test/uwp/MainPage.xaml.cpp
+++ b/cpp/test/uwp/MainPage.xaml.cpp
@@ -365,6 +365,12 @@ Runnable::run()
         args.push_back("--Ice.ThreadPool.Server.SizeWarn=0");
     }
 
+    if(configUseSSL(_config))
+    {
+        args.push_back("--IceSSL.CertFile=ms-appx:///client.p12");
+        args.push_back("--IceSSL.Password=password");
+    }
+
     args.push_back("--Ice.Default.Host=" + _config.host);
     args.push_back("--Ice.Default.Protocol=" + _config.protocol);
 
@@ -534,14 +540,13 @@ TestRunner::run()
         {
             if(!_test->server.empty())
             {
+                printLineToConsoleOutput("**** running test " + _test->name);
                 if(_config.server == "winrt")
                 {
-                    printLineToConsoleOutput("**** running test " + _test->name);
                     runClientServerTest(_test->server, _test->client);
                 }
                 else
-                {
-                    printLineToConsoleOutput("**** running test " + _test->name);
+                {                    
                     runClientServerTestWithRemoteServer(_test->client);
                 }
             }
diff --git a/cpp/test/uwp/Package.appxmanifest b/cpp/test/uwp/Package.appxmanifest
index 812cc643577..139cb1e6ac4 100644
--- a/cpp/test/uwp/Package.appxmanifest
+++ b/cpp/test/uwp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" Publisher="CN=ZeroC UWP Test Suite" Version="1.0.0.0" />
+  <Identity Name="ice-uwp-test-suite" Publisher="CN=ZeroC UWP Test Suite" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Ice Test Suite</DisplayName>
diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj b/cpp/test/uwp/msbuild/uwp.vcxproj
index 29bf9f7396c..19125e0b59c 100644
--- a/cpp/test/uwp/msbuild/uwp.vcxproj
+++ b/cpp/test/uwp/msbuild/uwp.vcxproj
@@ -278,6 +278,14 @@
     <None Include="..\..\..\..\certs\cacert.der">
       <DeploymentContent>true</DeploymentContent>
     </None>
+    <None Include="..\..\..\..\certs\client.p12">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="..\..\IceSSL\certs\cacert1.pem">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
@@ -392,6 +400,61 @@
     <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="..\TestSuite_TemporaryKey.pfx" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj.filters b/cpp/test/uwp/msbuild/uwp.vcxproj.filters
index c39cf594af4..719199fbda3 100644
--- a/cpp/test/uwp/msbuild/uwp.vcxproj.filters
+++ b/cpp/test/uwp/msbuild/uwp.vcxproj.filters
@@ -1484,5 +1484,62 @@
     <None Include="..\..\IceSSL\certs\c_rsa_pass_ca1.p12">
       <Filter>certs</Filter>
     </None>
+    <None Include="..\..\..\..\certs\client.p12">
+      <Filter>certs</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\client\Win32\Debug\Ice_optional_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\server\Win32\Debug\Ice_optional_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Debug\Ice_optional_serveramd.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\serveramd\Win32\Release\Ice_optional_serveramd.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\client\Win32\Release\Ice_optional_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\client\x64\Release\Ice_optional_client.dll">
+      <Filter>Tests\x64\Release</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\client\x64\Debug\Ice_optional_client.dll">
+      <Filter>Tests\x64\Debug</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\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\server\x64\Release\Ice_optional_server.dll">
+      <Filter>Tests\x64\Release</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\server\x64\Debug\Ice_optional_server.dll">
+      <Filter>Tests\x64\Debug</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\x64\Debug\Ice_optional_serveramd.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\Ice\optional\msbuild\uwp\serveramd\x64\Release\Ice_optional_serveramd.dll">
+      <Filter>Tests\x64\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>
   </ItemGroup>
 </Project>
\ No newline at end of file