UWP test suite fixes

5 files changed, 9 insertions, 75 deletions

diff --git a/cpp/msbuild/ice.testuwp.sln b/cpp/msbuild/ice.testuwp.sln
index da56272b916..23afa7a0bad 100644
--- a/cpp/msbuild/ice.testuwp.sln
+++ b/cpp/msbuild/ice.testuwp.sln
@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\proxy
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcommon", "..\test\Common\msbuild\uwp\testcommon.vcxproj", "{3C63CD50-8B47-41B9-B414-D74B918F9BE1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcommonuwp++11", "..\test\Common\msbuild\uwp\testcommonuwp++11.vcxproj", "{3C63CD50-8B47-41B9-B414-D74B918F9BE1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uwp", "..\test\uwp\msbuild\uwp.vcxproj", "{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/cpp/test/Common/msbuild/uwp/testcommon.vcxproj b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj
index 546dd588b50..1acbaf6e5ee 100644
--- a/cpp/test/Common/msbuild/uwp/testcommon.vcxproj
+++ b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj
@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3C63CD50-8B47-41B9-B414-D74B918F9BE1}</ProjectGuid>
-    <Keyword>DynamicLibrary</Keyword>
+    <Keyword>StaticLibrary</Keyword>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -41,32 +41,32 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
@@ -96,36 +96,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\TestCommon.cpp" />
     <ClCompile Include="ARM\Debug\Controller.cpp">
@@ -222,4 +192,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cpp/test/Common/msbuild/uwp/testcommon.vcxproj.filters b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj.filters
index baaa8be5b66..baaa8be5b66 100644
--- a/cpp/test/Common/msbuild/uwp/testcommon.vcxproj.filters
+++ b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj.filters
diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj b/cpp/test/uwp/msbuild/uwp.vcxproj
index 0682ea6d666..3a0bc452538 100644
--- a/cpp/test/uwp/msbuild/uwp.vcxproj
+++ b/cpp/test/uwp/msbuild/uwp.vcxproj
@@ -264,9 +264,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Common\msbuild\uwp\Win32\Debug\testcommon$(IceSoVersion)uwp++11d.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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>
@@ -446,9 +443,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Common\msbuild\uwp\Win32\Release\testcommon$(IceSoVersion)uwp++11.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|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>
@@ -628,9 +622,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Common\msbuild\uwp\x64\Debug\testcommon$(IceSoVersion)uwp++11d.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">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>
@@ -810,9 +801,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Common\msbuild\uwp\x64\Release\testcommon$(IceSoVersion)uwp++11.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
-    </None>
     <None Include="..\..\Ice\acm\msbuild\uwp\client\x64\Release\Ice_acm_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
@@ -992,9 +980,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Common\msbuild\uwp\ARM\Release\testcommon$(IceSoVersion)uwp++11.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
-    </None>
     <None Include="..\..\Ice\acm\msbuild\uwp\client\ARM\Release\Ice_acm_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
     </None>
@@ -1174,9 +1159,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Common\msbuild\uwp\ARM\Debug\testcommon$(IceSoVersion)uwp++11d.dll">
-      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
-    </None>
     <None Include="..\..\Ice\acm\msbuild\uwp\client\ARM\Debug\Ice_acm_client.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
     </None>
diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj.filters b/cpp/test/uwp/msbuild/uwp.vcxproj.filters
index be2841c22b1..cafb1bca0cf 100644
--- a/cpp/test/uwp/msbuild/uwp.vcxproj.filters
+++ b/cpp/test/uwp/msbuild/uwp.vcxproj.filters
@@ -1423,23 +1423,5 @@
     <None Include="..\..\Ice\udp\msbuild\uwp\server\ARM\Debug\Ice_udp_server.dll">
       <Filter>Tests\ARM\Debug</Filter>
     </None>
-    <None Include="..\..\Common\msbuild\uwp\Win32\Release\testcommon$(IceSoVersion)uwp++11.dll">
-      <Filter>Tests\Win32\Release</Filter>
-    </None>
-    <None Include="..\..\Common\msbuild\uwp\x64\Release\testcommon$(IceSoVersion)uwp++11.dll">
-      <Filter>Tests\x64\Release</Filter>
-    </None>
-    <None Include="..\..\Common\msbuild\uwp\ARM\Release\testcommon$(IceSoVersion)uwp++11.dll">
-      <Filter>Tests\ARM\Release</Filter>
-    </None>
-    <None Include="..\..\Common\msbuild\uwp\x64\Debug\testcommon$(IceSoVersion)uwp++11d.dll">
-      <Filter>Tests\x64\Debug</Filter>
-    </None>
-    <None Include="..\..\Common\msbuild\uwp\ARM\Debug\testcommon$(IceSoVersion)uwp++11d.dll">
-      <Filter>Tests\ARM\Debug</Filter>
-    </None>
-    <None Include="..\..\Common\msbuild\uwp\Win32\Debug\testcommon$(IceSoVersion)uwp++11d.dll">
-      <Filter>Tests\Win32\Debug</Filter>
-    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file