Ice/scope fix Android and UWP builds

7 files changed, 115 insertions, 59 deletions

diff --git a/cpp/msbuild/ice.testuwp.sln b/cpp/msbuild/ice.testuwp.sln
index fbe953c7253..d3217631d72 100644
--- a/cpp/msbuild/ice.testuwp.sln
+++ b/cpp/msbuild/ice.testuwp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2D52604F-E2AD-4586-BBD7-BD13536C702C}"
 EndProject
@@ -380,7 +380,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "controller", "..\test\uwp\c
 		{9BA8E20C-9624-4370-B1AB-BD696C853951} = {9BA8E20C-9624-4370-B1AB-BD696C853951}
 		{4F70E110-D2EE-4626-BD53-39C49F159C81} = {4F70E110-D2EE-4626-BD53-39C49F159C81}
 		{651CD011-09F7-481E-8260-36D2FA3A6788} = {651CD011-09F7-481E-8260-36D2FA3A6788}
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342} = {5B0C8615-BB38-41DE-A2B7-EC0835C0D342}
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000} = {5B0C8615-BB38-41DE-A2B7-EC0835000000}
 		{564F5319-FD59-450B-889D-748ACCC4887C} = {564F5319-FD59-450B-889D-748ACCC4887C}
 		{3082831B-0F5B-45FA-B208-4B3EB15C7213} = {3082831B-0F5B-45FA-B208-4B3EB15C7213}
 		{6D739820-348B-4143-A473-E9D47B48A35D} = {6D739820-348B-4143-A473-E9D47B48A35D}
@@ -542,7 +542,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\serva
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collocated", "..\test\Ice\servantLocator\msbuild\uwp\collocated\collocated.vcxproj", "{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collocated", "..\test\Ice\servantLocator\msbuild\uwp\collocated\collocated.vcxproj", "{5B0C8615-BB38-41DE-A2B7-EC0835000000}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
@@ -597,6 +597,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serveramd", "..\test\Ice\sl
 		{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scope", "scope", "{FC791A53-7F02-493F-94E4-9BFDECD48ACC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\scope\msbuild\uwp\client\client.vcxproj", "{5ABB92D9-AA40-40CA-8175-40AE2725AF38}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\scope\msbuild\uwp\server\server.vcxproj", "{E474F2DA-3C50-4717-9270-C23FD72A6CB7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -1562,18 +1568,18 @@ Global
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42}.Release|Win32.Build.0 = Release|Win32
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42}.Release|x64.ActiveCfg = Release|x64
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42}.Release|x64.Build.0 = Release|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|ARM.Build.0 = Debug|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|Win32.Build.0 = Debug|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|x64.ActiveCfg = Debug|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Debug|x64.Build.0 = Debug|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|ARM.ActiveCfg = Release|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|ARM.Build.0 = Release|ARM
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|Win32.ActiveCfg = Release|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|Win32.Build.0 = Release|Win32
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|x64.ActiveCfg = Release|x64
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342}.Release|x64.Build.0 = Release|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|ARM.Build.0 = Debug|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|Win32.Build.0 = Debug|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|x64.ActiveCfg = Debug|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Debug|x64.Build.0 = Debug|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|ARM.ActiveCfg = Release|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|ARM.Build.0 = Release|ARM
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|Win32.ActiveCfg = Release|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|Win32.Build.0 = Release|Win32
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|x64.ActiveCfg = Release|x64
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000}.Release|x64.Build.0 = Release|x64
 		{DADB31F5-6185-4BF5-B521-70B844BB954D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{DADB31F5-6185-4BF5-B521-70B844BB954D}.Debug|ARM.Build.0 = Debug|ARM
 		{DADB31F5-6185-4BF5-B521-70B844BB954D}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -1682,6 +1688,30 @@ Global
 		{3D3A850C-A012-4DF2-A272-87C75687C026}.Release|Win32.Build.0 = Release|Win32
 		{3D3A850C-A012-4DF2-A272-87C75687C026}.Release|x64.ActiveCfg = Release|x64
 		{3D3A850C-A012-4DF2-A272-87C75687C026}.Release|x64.Build.0 = Release|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|ARM.Build.0 = Debug|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|Win32.Build.0 = Debug|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|x64.ActiveCfg = Debug|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Debug|x64.Build.0 = Debug|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|ARM.ActiveCfg = Release|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|ARM.Build.0 = Release|ARM
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|Win32.ActiveCfg = Release|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|Win32.Build.0 = Release|Win32
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|x64.ActiveCfg = Release|x64
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38}.Release|x64.Build.0 = Release|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|ARM.Build.0 = Debug|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|Win32.Build.0 = Debug|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|x64.ActiveCfg = Debug|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Debug|x64.Build.0 = Debug|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|ARM.ActiveCfg = Release|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|ARM.Build.0 = Release|ARM
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|Win32.ActiveCfg = Release|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|Win32.Build.0 = Release|Win32
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|x64.ActiveCfg = Release|x64
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1798,7 +1828,7 @@ Global
 		{28B7F535-8C3B-47DA-BD9E-F8EDF037AD50} = {33C073C8-B76A-4C52-8373-1C32237981AC}
 		{4C2F942B-E834-4E01-8868-1E0B973DB7F3} = {345EB31B-1B1C-43E9-87C0-2FC7319A5CBD}
 		{C2FE2F8B-AA62-43F8-83E9-53D580E71B42} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
-		{5B0C8615-BB38-41DE-A2B7-EC0835C0D342} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
+		{5B0C8615-BB38-41DE-A2B7-EC0835000000} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
 		{DADB31F5-6185-4BF5-B521-70B844BB954D} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
 		{7F03370C-C18B-4159-985E-73F4C1BD0BFF} = {4C2F942B-E834-4E01-8868-1E0B973DB7F3}
 		{5C5041F2-03DD-4BA4-81E6-65031F9413B8} = {345EB31B-1B1C-43E9-87C0-2FC7319A5CBD}
@@ -1812,5 +1842,11 @@ Global
 		{8C27154A-8427-4033-8178-495341B1D3A8} = {1FD72BFE-7894-41A7-A2C5-5B2EAEEF168A}
 		{B9FD897C-70F1-4639-891B-F5590CCCB404} = {1FD72BFE-7894-41A7-A2C5-5B2EAEEF168A}
 		{3D3A850C-A012-4DF2-A272-87C75687C026} = {1FD72BFE-7894-41A7-A2C5-5B2EAEEF168A}
+		{FC791A53-7F02-493F-94E4-9BFDECD48ACC} = {345EB31B-1B1C-43E9-87C0-2FC7319A5CBD}
+		{5ABB92D9-AA40-40CA-8175-40AE2725AF38} = {FC791A53-7F02-493F-94E4-9BFDECD48ACC}
+		{E474F2DA-3C50-4717-9270-C23FD72A6CB7} = {FC791A53-7F02-493F-94E4-9BFDECD48ACC}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {640815E7-554F-4EF2-8BBB-0478C504E426}
 	EndGlobalSection
 EndGlobal
diff --git a/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj
index 723324ebe23..711d8e18257 100644
--- a/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj
@@ -102,22 +102,22 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>Ice_operations_client</TargetName>
+    <TargetName>Ice_scope_client</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>Ice_operations_client</TargetName>
+    <TargetName>Ice_scope_client</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>Ice_operations_client</TargetName>
+    <TargetName>Ice_scope_client</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <TargetName>Ice_operations_client</TargetName>
+    <TargetName>Ice_scope_client</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>Ice_operations_client</TargetName>
+    <TargetName>Ice_scope_client</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <TargetName>Ice_operations_client</TargetName>
+    <TargetName>Ice_scope_client</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -154,13 +154,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\AllTests.cpp" />
-    <ClCompile Include="..\..\..\BatchOneways.cpp" />
-    <ClCompile Include="..\..\..\BatchOnewaysAMI.cpp" />
     <ClCompile Include="..\..\..\Client.cpp" />
-    <ClCompile Include="..\..\..\Oneways.cpp" />
-    <ClCompile Include="..\..\..\OnewaysAMI.cpp" />
-    <ClCompile Include="..\..\..\Twoways.cpp" />
-    <ClCompile Include="..\..\..\TwowaysAMI.cpp" />
     <ClCompile Include="ARM\Debug\Test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -284,4 +278,4 @@
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters b/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters
index b207920d5dd..716fb25621a 100644
--- a/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters
+++ b/cpp/test/Ice/scope/msbuild/uwp/client/client.vcxproj.filters
@@ -7,24 +7,6 @@
     <ClCompile Include="..\..\..\Client.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\BatchOneways.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\BatchOnewaysAMI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Oneways.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\OnewaysAMI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Twoways.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\TwowaysAMI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Win32\Debug\Test.cpp">
       <Filter>Source Files\Win32\Debug</Filter>
     </ClCompile>
diff --git a/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj
index 5abd2e7d5fa..1065fbc277f 100644
--- a/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj
@@ -102,23 +102,23 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>Ice_operations_server</TargetName>
+    <TargetName>Ice_scope_server</TargetName>
     <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>Ice_operations_server</TargetName>
+    <TargetName>Ice_scope_server</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>Ice_operations_server</TargetName>
+    <TargetName>Ice_scope_server</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <TargetName>Ice_operations_server</TargetName>
+    <TargetName>Ice_scope_server</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>Ice_operations_server</TargetName>
+    <TargetName>Ice_scope_server</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <TargetName>Ice_operations_server</TargetName>
+    <TargetName>Ice_scope_server</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -168,7 +168,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Server.cpp" />
-    <ClCompile Include="..\..\..\TestI.cpp" />
     <ClCompile Include="ARM\Debug\Test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -290,4 +289,4 @@
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters b/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters
index 166a262534d..6e6bdc090be 100644
--- a/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters
+++ b/cpp/test/Ice/scope/msbuild/uwp/server/server.vcxproj.filters
@@ -4,9 +4,6 @@
     <ClCompile Include="..\..\..\Server.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\TestI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Win32\Debug\Test.cpp">
       <Filter>Source Files\Win32\Debug</Filter>
     </ClCompile>
diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj b/cpp/test/uwp/controller/msbuild/controller.vcxproj
index d89526185c1..8ecabd7a99e 100644
--- a/cpp/test/uwp/controller/msbuild/controller.vcxproj
+++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj
@@ -329,6 +329,30 @@
     <None Include="..\..\..\IceSSL\certs\s_rsa_ca1_pub.pem">
       <DeploymentContent>true</DeploymentContent>
     </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Debug\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Release\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Debug\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Release\Ice_scope_client.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Debug\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Release\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Debug\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Release\Ice_scope_server.dll">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+    </None>
     <None Include="controller_TemporaryKey.pfx" />
     <SliceCompile Include="..\..\..\..\..\scripts\Controller.ice" />
     <None Include="packages.config" />
diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
index 834dc7b38d2..1b6da532335 100644
--- a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
+++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters
@@ -1779,6 +1779,30 @@
       <Filter>Tests\ARM\Release</Filter>
     </None>
     <None Include="packages.config" />
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Release\Ice_scope_client.dll">
+      <Filter>Tests\x64\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Release\Ice_scope_server.dll">
+      <Filter>Tests\x64\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\x64\Debug\Ice_scope_client.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\x64\Debug\Ice_scope_server.dll">
+      <Filter>Tests\x64\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Debug\Ice_scope_server.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Debug\Ice_scope_client.dll">
+      <Filter>Tests\Win32\Debug</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\client\Win32\Release\Ice_scope_client.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
+    <None Include="..\..\..\Ice\scope\msbuild\uwp\server\Win32\Release\Ice_scope_server.dll">
+      <Filter>Tests\Win32\Release</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\..\..\scripts\Controller.ice">