summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/msbuild/ice.testuwp.sln557
-rw-r--r--cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj4
-rw-r--r--cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj4
-rw-r--r--cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj4
-rw-r--r--cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj4
-rw-r--r--cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj4
-rw-r--r--cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj4
-rw-r--r--cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj4
-rw-r--r--cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj13
-rw-r--r--cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj13
-rw-r--r--cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/hash/msbuild/uwp/client.vcxproj13
-rw-r--r--cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj13
-rw-r--r--cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj13
-rw-r--r--cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj19
-rw-r--r--cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj.filters1
-rw-r--r--cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj19
-rw-r--r--cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj.filters1
-rw-r--r--cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj19
-rw-r--r--cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj.filters1
-rw-r--r--cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj13
-rw-r--r--cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj13
-rw-r--r--cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/stream/msbuild/uwp/client.vcxproj13
-rw-r--r--cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj13
-rw-r--r--cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj13
-rw-r--r--cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj267
-rw-r--r--cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj.filters123
-rw-r--r--cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config7
-rw-r--r--cpp/test/uwp/msbuild/uwp.vcxproj136
-rw-r--r--cpp/test/uwp/msbuild/uwp.vcxproj.filters58
79 files changed, 1559 insertions, 457 deletions
diff --git a/cpp/msbuild/ice.testuwp.sln b/cpp/msbuild/ice.testuwp.sln
index 23afa7a0bad..a88b286a548 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.24720.0
+VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2D52604F-E2AD-4586-BBD7-BD13536C702C}"
EndProject
@@ -416,755 +416,809 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serveramd", "..\test\Ice\me
{3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\optional\msbuild\uwp\client\client.vcxproj", "{2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\optional\msbuild\uwp\server\server.vcxproj", "{260FAC2F-76C9-4B2D-AF70-B722B2B5D450}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serveramd", "..\test\Ice\optional\msbuild\uwp\serveramd\serveramd.vcxproj", "{A357766C-B425-4898-883D-2D20C77A1749}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IceSSL", "IceSSL", "{01B45DA0-1D88-4840-9FBD-3777512BB270}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "configuration", "configuration", "{FD49C04F-BA73-4AA5-BBD2-FAC6CB6DEA10}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\IceSSL\configuration\msbuild\uwp\client\client.vcxproj", "{A1D10DF9-8010-45BF-9E96-07C8949174C6}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
- Debug|x64 = Debug|x64
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|ARM = Release|ARM
- Release|x64 = Release|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|ARM.ActiveCfg = Debug|ARM
{E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|ARM.Build.0 = Debug|ARM
+ {E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|Win32.Build.0 = Debug|Win32
{E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|x64.ActiveCfg = Debug|x64
{E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|x64.Build.0 = Debug|x64
{E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|x64.Deploy.0 = Debug|x64
- {E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|Win32.ActiveCfg = Debug|Win32
- {E054B754-914F-4F72-A170-7098BED7EC1C}.Debug|Win32.Build.0 = Debug|Win32
{E054B754-914F-4F72-A170-7098BED7EC1C}.Release|ARM.ActiveCfg = Release|ARM
{E054B754-914F-4F72-A170-7098BED7EC1C}.Release|ARM.Build.0 = Release|ARM
- {E054B754-914F-4F72-A170-7098BED7EC1C}.Release|x64.ActiveCfg = Release|x64
- {E054B754-914F-4F72-A170-7098BED7EC1C}.Release|x64.Build.0 = Release|x64
{E054B754-914F-4F72-A170-7098BED7EC1C}.Release|Win32.ActiveCfg = Release|Win32
{E054B754-914F-4F72-A170-7098BED7EC1C}.Release|Win32.Build.0 = Release|Win32
+ {E054B754-914F-4F72-A170-7098BED7EC1C}.Release|x64.ActiveCfg = Release|x64
+ {E054B754-914F-4F72-A170-7098BED7EC1C}.Release|x64.Build.0 = Release|x64
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|ARM.ActiveCfg = Debug|ARM
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|ARM.Build.0 = Debug|ARM
- {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|x64.ActiveCfg = Debug|x64
- {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|x64.Build.0 = Debug|x64
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|Win32.ActiveCfg = Debug|Win32
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|Win32.Build.0 = Debug|Win32
+ {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|x64.ActiveCfg = Debug|x64
+ {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Debug|x64.Build.0 = Debug|x64
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|ARM.ActiveCfg = Release|ARM
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|ARM.Build.0 = Release|ARM
- {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|x64.ActiveCfg = Release|x64
- {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|x64.Build.0 = Release|x64
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|Win32.ActiveCfg = Release|Win32
{3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|Win32.Build.0 = Release|Win32
+ {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|x64.ActiveCfg = Release|x64
+ {3C63CD50-8B47-41B9-B414-D74B918F9BE1}.Release|x64.Build.0 = Release|x64
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.ActiveCfg = Debug|ARM
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.Build.0 = Debug|ARM
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.Deploy.0 = Debug|ARM
- {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.ActiveCfg = Debug|x64
- {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Build.0 = Debug|x64
- {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Deploy.0 = Debug|x64
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.ActiveCfg = Debug|Win32
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.Build.0 = Debug|Win32
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.Deploy.0 = Debug|Win32
+ {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.ActiveCfg = Debug|x64
+ {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Build.0 = Debug|x64
+ {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Deploy.0 = Debug|x64
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.ActiveCfg = Release|ARM
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.Build.0 = Release|ARM
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.Deploy.0 = Release|ARM
- {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.ActiveCfg = Release|x64
- {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Build.0 = Release|x64
- {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Deploy.0 = Release|x64
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.ActiveCfg = Release|Win32
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.Build.0 = Release|Win32
{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.Deploy.0 = Release|Win32
+ {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.ActiveCfg = Release|x64
+ {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Build.0 = Release|x64
+ {3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Deploy.0 = Release|x64
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|ARM.ActiveCfg = Debug|ARM
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|ARM.Build.0 = Debug|ARM
- {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|x64.ActiveCfg = Debug|x64
- {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|x64.Build.0 = Debug|x64
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|Win32.ActiveCfg = Debug|Win32
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|Win32.Build.0 = Debug|Win32
+ {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|x64.ActiveCfg = Debug|x64
+ {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Debug|x64.Build.0 = Debug|x64
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|ARM.ActiveCfg = Release|ARM
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|ARM.Build.0 = Release|ARM
- {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|x64.ActiveCfg = Release|x64
- {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|x64.Build.0 = Release|x64
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|Win32.ActiveCfg = Release|Win32
{D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|Win32.Build.0 = Release|Win32
+ {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|x64.ActiveCfg = Release|x64
+ {D3D1D1E5-354B-419E-A125-4E0BB8B6965C}.Release|x64.Build.0 = Release|x64
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|ARM.ActiveCfg = Debug|ARM
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|ARM.Build.0 = Debug|ARM
- {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|x64.ActiveCfg = Debug|x64
- {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|x64.Build.0 = Debug|x64
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|Win32.ActiveCfg = Debug|Win32
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|Win32.Build.0 = Debug|Win32
+ {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|x64.ActiveCfg = Debug|x64
+ {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Debug|x64.Build.0 = Debug|x64
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|ARM.ActiveCfg = Release|ARM
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|ARM.Build.0 = Release|ARM
- {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|x64.ActiveCfg = Release|x64
- {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|x64.Build.0 = Release|x64
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|Win32.ActiveCfg = Release|Win32
{0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|Win32.Build.0 = Release|Win32
+ {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|x64.ActiveCfg = Release|x64
+ {0A1B4C03-EE41-4BAE-9CDA-CEEE1CB619DE}.Release|x64.Build.0 = Release|x64
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|ARM.ActiveCfg = Debug|ARM
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|ARM.Build.0 = Debug|ARM
- {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|x64.ActiveCfg = Debug|x64
- {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|x64.Build.0 = Debug|x64
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|Win32.ActiveCfg = Debug|Win32
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|Win32.Build.0 = Debug|Win32
+ {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|x64.ActiveCfg = Debug|x64
+ {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Debug|x64.Build.0 = Debug|x64
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|ARM.ActiveCfg = Release|ARM
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|ARM.Build.0 = Release|ARM
- {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|x64.ActiveCfg = Release|x64
- {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|x64.Build.0 = Release|x64
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|Win32.ActiveCfg = Release|Win32
{86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|Win32.Build.0 = Release|Win32
+ {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|x64.ActiveCfg = Release|x64
+ {86413A32-F52B-4287-9B04-6D9B0A52C00E}.Release|x64.Build.0 = Release|x64
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|ARM.ActiveCfg = Debug|ARM
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|ARM.Build.0 = Debug|ARM
- {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|x64.ActiveCfg = Debug|x64
- {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|x64.Build.0 = Debug|x64
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|Win32.ActiveCfg = Debug|Win32
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|Win32.Build.0 = Debug|Win32
+ {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|x64.ActiveCfg = Debug|x64
+ {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Debug|x64.Build.0 = Debug|x64
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|ARM.ActiveCfg = Release|ARM
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|ARM.Build.0 = Release|ARM
- {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|x64.ActiveCfg = Release|x64
- {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|x64.Build.0 = Release|x64
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|Win32.ActiveCfg = Release|Win32
{DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|Win32.Build.0 = Release|Win32
+ {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|x64.ActiveCfg = Release|x64
+ {DB5C7DE0-D560-481E-9D59-E9422DCF755E}.Release|x64.Build.0 = Release|x64
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|ARM.ActiveCfg = Debug|ARM
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|ARM.Build.0 = Debug|ARM
- {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|x64.ActiveCfg = Debug|x64
- {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|x64.Build.0 = Debug|x64
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|Win32.ActiveCfg = Debug|Win32
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|Win32.Build.0 = Debug|Win32
+ {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|x64.ActiveCfg = Debug|x64
+ {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Debug|x64.Build.0 = Debug|x64
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|ARM.ActiveCfg = Release|ARM
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|ARM.Build.0 = Release|ARM
- {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|x64.ActiveCfg = Release|x64
- {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|x64.Build.0 = Release|x64
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|Win32.ActiveCfg = Release|Win32
{9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|Win32.Build.0 = Release|Win32
+ {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|x64.ActiveCfg = Release|x64
+ {9420DDA1-ED44-4D4E-B9A8-6E4048663202}.Release|x64.Build.0 = Release|x64
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|ARM.ActiveCfg = Debug|ARM
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|ARM.Build.0 = Debug|ARM
- {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|x64.ActiveCfg = Debug|x64
- {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|x64.Build.0 = Debug|x64
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|Win32.ActiveCfg = Debug|Win32
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|Win32.Build.0 = Debug|Win32
+ {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|x64.ActiveCfg = Debug|x64
+ {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Debug|x64.Build.0 = Debug|x64
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|ARM.ActiveCfg = Release|ARM
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|ARM.Build.0 = Release|ARM
- {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|x64.ActiveCfg = Release|x64
- {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|x64.Build.0 = Release|x64
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|Win32.ActiveCfg = Release|Win32
{F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|Win32.Build.0 = Release|Win32
+ {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|x64.ActiveCfg = Release|x64
+ {F6FD2957-8FBE-4635-ADCF-136C88A8432F}.Release|x64.Build.0 = Release|x64
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|ARM.ActiveCfg = Debug|ARM
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|ARM.Build.0 = Debug|ARM
- {9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|x64.ActiveCfg = Debug|x64
- {9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|x64.Build.0 = Debug|x64
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|Win32.ActiveCfg = Debug|Win32
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|Win32.Build.0 = Debug|Win32
+ {9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|x64.ActiveCfg = Debug|x64
+ {9BA8E20C-9624-4370-B1AB-BD696C853951}.Debug|x64.Build.0 = Debug|x64
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|ARM.ActiveCfg = Release|ARM
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|ARM.Build.0 = Release|ARM
- {9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|x64.ActiveCfg = Release|x64
- {9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|x64.Build.0 = Release|x64
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|Win32.ActiveCfg = Release|Win32
{9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|Win32.Build.0 = Release|Win32
+ {9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|x64.ActiveCfg = Release|x64
+ {9BA8E20C-9624-4370-B1AB-BD696C853951}.Release|x64.Build.0 = Release|x64
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|ARM.ActiveCfg = Debug|ARM
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|ARM.Build.0 = Debug|ARM
- {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|x64.ActiveCfg = Debug|x64
- {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|x64.Build.0 = Debug|x64
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|Win32.ActiveCfg = Debug|Win32
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|Win32.Build.0 = Debug|Win32
+ {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|x64.ActiveCfg = Debug|x64
+ {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Debug|x64.Build.0 = Debug|x64
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|ARM.ActiveCfg = Release|ARM
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|ARM.Build.0 = Release|ARM
- {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|x64.ActiveCfg = Release|x64
- {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|x64.Build.0 = Release|x64
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|Win32.ActiveCfg = Release|Win32
{5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|Win32.Build.0 = Release|Win32
+ {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|x64.ActiveCfg = Release|x64
+ {5F90F7D0-509E-40F2-A6D0-6CC17DA4D793}.Release|x64.Build.0 = Release|x64
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|ARM.ActiveCfg = Debug|ARM
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|ARM.Build.0 = Debug|ARM
- {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|x64.ActiveCfg = Debug|x64
- {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|x64.Build.0 = Debug|x64
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|Win32.ActiveCfg = Debug|Win32
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|Win32.Build.0 = Debug|Win32
+ {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|x64.ActiveCfg = Debug|x64
+ {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Debug|x64.Build.0 = Debug|x64
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|ARM.ActiveCfg = Release|ARM
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|ARM.Build.0 = Release|ARM
- {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|x64.ActiveCfg = Release|x64
- {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|x64.Build.0 = Release|x64
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|Win32.ActiveCfg = Release|Win32
{73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|Win32.Build.0 = Release|Win32
+ {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|x64.ActiveCfg = Release|x64
+ {73FF00B7-5AC6-4D88-B444-91A8478EB448}.Release|x64.Build.0 = Release|x64
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|ARM.ActiveCfg = Debug|ARM
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|ARM.Build.0 = Debug|ARM
- {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|x64.ActiveCfg = Debug|x64
- {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|x64.Build.0 = Debug|x64
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|Win32.ActiveCfg = Debug|Win32
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|Win32.Build.0 = Debug|Win32
+ {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|x64.ActiveCfg = Debug|x64
+ {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Debug|x64.Build.0 = Debug|x64
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|ARM.ActiveCfg = Release|ARM
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|ARM.Build.0 = Release|ARM
- {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|x64.ActiveCfg = Release|x64
- {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|x64.Build.0 = Release|x64
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|Win32.ActiveCfg = Release|Win32
{C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|Win32.Build.0 = Release|Win32
+ {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|x64.ActiveCfg = Release|x64
+ {C443A16E-72C0-42BC-B353-FFFDC766B11E}.Release|x64.Build.0 = Release|x64
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|ARM.ActiveCfg = Debug|ARM
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|ARM.Build.0 = Debug|ARM
- {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|x64.ActiveCfg = Debug|x64
- {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|x64.Build.0 = Debug|x64
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|Win32.ActiveCfg = Debug|Win32
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|Win32.Build.0 = Debug|Win32
+ {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|x64.ActiveCfg = Debug|x64
+ {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Debug|x64.Build.0 = Debug|x64
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|ARM.ActiveCfg = Release|ARM
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|ARM.Build.0 = Release|ARM
- {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|x64.ActiveCfg = Release|x64
- {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|x64.Build.0 = Release|x64
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|Win32.ActiveCfg = Release|Win32
{E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|Win32.Build.0 = Release|Win32
+ {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|x64.ActiveCfg = Release|x64
+ {E41C7904-82F0-4A2E-979E-9CB8A561BF7B}.Release|x64.Build.0 = Release|x64
{D34680A8-0345-43BE-8204-C997C891490F}.Debug|ARM.ActiveCfg = Debug|ARM
{D34680A8-0345-43BE-8204-C997C891490F}.Debug|ARM.Build.0 = Debug|ARM
- {D34680A8-0345-43BE-8204-C997C891490F}.Debug|x64.ActiveCfg = Debug|x64
- {D34680A8-0345-43BE-8204-C997C891490F}.Debug|x64.Build.0 = Debug|x64
{D34680A8-0345-43BE-8204-C997C891490F}.Debug|Win32.ActiveCfg = Debug|Win32
{D34680A8-0345-43BE-8204-C997C891490F}.Debug|Win32.Build.0 = Debug|Win32
+ {D34680A8-0345-43BE-8204-C997C891490F}.Debug|x64.ActiveCfg = Debug|x64
+ {D34680A8-0345-43BE-8204-C997C891490F}.Debug|x64.Build.0 = Debug|x64
{D34680A8-0345-43BE-8204-C997C891490F}.Release|ARM.ActiveCfg = Release|ARM
{D34680A8-0345-43BE-8204-C997C891490F}.Release|ARM.Build.0 = Release|ARM
- {D34680A8-0345-43BE-8204-C997C891490F}.Release|x64.ActiveCfg = Release|x64
- {D34680A8-0345-43BE-8204-C997C891490F}.Release|x64.Build.0 = Release|x64
{D34680A8-0345-43BE-8204-C997C891490F}.Release|Win32.ActiveCfg = Release|Win32
{D34680A8-0345-43BE-8204-C997C891490F}.Release|Win32.Build.0 = Release|Win32
+ {D34680A8-0345-43BE-8204-C997C891490F}.Release|x64.ActiveCfg = Release|x64
+ {D34680A8-0345-43BE-8204-C997C891490F}.Release|x64.Build.0 = Release|x64
{564F5319-FD59-450B-889D-748ACCC4887C}.Debug|ARM.ActiveCfg = Debug|ARM
{564F5319-FD59-450B-889D-748ACCC4887C}.Debug|ARM.Build.0 = Debug|ARM
- {564F5319-FD59-450B-889D-748ACCC4887C}.Debug|x64.ActiveCfg = Debug|x64
- {564F5319-FD59-450B-889D-748ACCC4887C}.Debug|x64.Build.0 = Debug|x64
{564F5319-FD59-450B-889D-748ACCC4887C}.Debug|Win32.ActiveCfg = Debug|Win32
{564F5319-FD59-450B-889D-748ACCC4887C}.Debug|Win32.Build.0 = Debug|Win32
+ {564F5319-FD59-450B-889D-748ACCC4887C}.Debug|x64.ActiveCfg = Debug|x64
+ {564F5319-FD59-450B-889D-748ACCC4887C}.Debug|x64.Build.0 = Debug|x64
{564F5319-FD59-450B-889D-748ACCC4887C}.Release|ARM.ActiveCfg = Release|ARM
{564F5319-FD59-450B-889D-748ACCC4887C}.Release|ARM.Build.0 = Release|ARM
- {564F5319-FD59-450B-889D-748ACCC4887C}.Release|x64.ActiveCfg = Release|x64
- {564F5319-FD59-450B-889D-748ACCC4887C}.Release|x64.Build.0 = Release|x64
{564F5319-FD59-450B-889D-748ACCC4887C}.Release|Win32.ActiveCfg = Release|Win32
{564F5319-FD59-450B-889D-748ACCC4887C}.Release|Win32.Build.0 = Release|Win32
+ {564F5319-FD59-450B-889D-748ACCC4887C}.Release|x64.ActiveCfg = Release|x64
+ {564F5319-FD59-450B-889D-748ACCC4887C}.Release|x64.Build.0 = Release|x64
{F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|ARM.ActiveCfg = Debug|ARM
{F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|ARM.Build.0 = Debug|ARM
- {F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|x64.ActiveCfg = Debug|x64
- {F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|x64.Build.0 = Debug|x64
{F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|Win32.ActiveCfg = Debug|Win32
{F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|Win32.Build.0 = Debug|Win32
+ {F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|x64.ActiveCfg = Debug|x64
+ {F5777CA5-235A-4442-837D-39E06F496BDD}.Debug|x64.Build.0 = Debug|x64
{F5777CA5-235A-4442-837D-39E06F496BDD}.Release|ARM.ActiveCfg = Release|ARM
{F5777CA5-235A-4442-837D-39E06F496BDD}.Release|ARM.Build.0 = Release|ARM
- {F5777CA5-235A-4442-837D-39E06F496BDD}.Release|x64.ActiveCfg = Release|x64
- {F5777CA5-235A-4442-837D-39E06F496BDD}.Release|x64.Build.0 = Release|x64
{F5777CA5-235A-4442-837D-39E06F496BDD}.Release|Win32.ActiveCfg = Release|Win32
{F5777CA5-235A-4442-837D-39E06F496BDD}.Release|Win32.Build.0 = Release|Win32
+ {F5777CA5-235A-4442-837D-39E06F496BDD}.Release|x64.ActiveCfg = Release|x64
+ {F5777CA5-235A-4442-837D-39E06F496BDD}.Release|x64.Build.0 = Release|x64
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|ARM.ActiveCfg = Debug|ARM
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|ARM.Build.0 = Debug|ARM
- {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|x64.ActiveCfg = Debug|x64
- {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|x64.Build.0 = Debug|x64
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|Win32.ActiveCfg = Debug|Win32
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|Win32.Build.0 = Debug|Win32
+ {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|x64.ActiveCfg = Debug|x64
+ {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Debug|x64.Build.0 = Debug|x64
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|ARM.ActiveCfg = Release|ARM
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|ARM.Build.0 = Release|ARM
- {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|x64.ActiveCfg = Release|x64
- {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|x64.Build.0 = Release|x64
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|Win32.ActiveCfg = Release|Win32
{0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|Win32.Build.0 = Release|Win32
+ {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|x64.ActiveCfg = Release|x64
+ {0F6AB478-7506-4572-AC9E-AA3D23A7376C}.Release|x64.Build.0 = Release|x64
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|ARM.ActiveCfg = Debug|ARM
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|ARM.Build.0 = Debug|ARM
- {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|x64.ActiveCfg = Debug|x64
- {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|x64.Build.0 = Debug|x64
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|Win32.ActiveCfg = Debug|Win32
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|Win32.Build.0 = Debug|Win32
+ {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|x64.ActiveCfg = Debug|x64
+ {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Debug|x64.Build.0 = Debug|x64
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|ARM.ActiveCfg = Release|ARM
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|ARM.Build.0 = Release|ARM
- {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|x64.ActiveCfg = Release|x64
- {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|x64.Build.0 = Release|x64
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|Win32.ActiveCfg = Release|Win32
{549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|Win32.Build.0 = Release|Win32
+ {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|x64.ActiveCfg = Release|x64
+ {549CC2B0-26D9-4B8E-9B2A-C8F6796D6D09}.Release|x64.Build.0 = Release|x64
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|ARM.ActiveCfg = Debug|ARM
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|ARM.Build.0 = Debug|ARM
- {44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|x64.ActiveCfg = Debug|x64
- {44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|x64.Build.0 = Debug|x64
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|Win32.ActiveCfg = Debug|Win32
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|Win32.Build.0 = Debug|Win32
+ {44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|x64.ActiveCfg = Debug|x64
+ {44197A7C-6783-4924-90CB-FAE18E5527C4}.Debug|x64.Build.0 = Debug|x64
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|ARM.ActiveCfg = Release|ARM
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|ARM.Build.0 = Release|ARM
- {44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|x64.ActiveCfg = Release|x64
- {44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|x64.Build.0 = Release|x64
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|Win32.ActiveCfg = Release|Win32
{44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|Win32.Build.0 = Release|Win32
+ {44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|x64.ActiveCfg = Release|x64
+ {44197A7C-6783-4924-90CB-FAE18E5527C4}.Release|x64.Build.0 = Release|x64
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|ARM.ActiveCfg = Debug|ARM
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|ARM.Build.0 = Debug|ARM
- {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|x64.ActiveCfg = Debug|x64
- {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|x64.Build.0 = Debug|x64
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|Win32.ActiveCfg = Debug|Win32
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|Win32.Build.0 = Debug|Win32
+ {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|x64.ActiveCfg = Debug|x64
+ {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Debug|x64.Build.0 = Debug|x64
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|ARM.ActiveCfg = Release|ARM
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|ARM.Build.0 = Release|ARM
- {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|x64.ActiveCfg = Release|x64
- {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|x64.Build.0 = Release|x64
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|Win32.ActiveCfg = Release|Win32
{3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|Win32.Build.0 = Release|Win32
+ {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|x64.ActiveCfg = Release|x64
+ {3BC25496-70A0-4C2D-9EFC-E4E473C6A71C}.Release|x64.Build.0 = Release|x64
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|ARM.ActiveCfg = Debug|ARM
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|ARM.Build.0 = Debug|ARM
- {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|x64.ActiveCfg = Debug|x64
- {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|x64.Build.0 = Debug|x64
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|Win32.ActiveCfg = Debug|Win32
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|Win32.Build.0 = Debug|Win32
+ {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|x64.ActiveCfg = Debug|x64
+ {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Debug|x64.Build.0 = Debug|x64
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|ARM.ActiveCfg = Release|ARM
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|ARM.Build.0 = Release|ARM
- {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|x64.ActiveCfg = Release|x64
- {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|x64.Build.0 = Release|x64
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|Win32.ActiveCfg = Release|Win32
{15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|Win32.Build.0 = Release|Win32
+ {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|x64.ActiveCfg = Release|x64
+ {15C5ACAF-F850-4C63-896B-AA2661B0ABCB}.Release|x64.Build.0 = Release|x64
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|ARM.ActiveCfg = Debug|ARM
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|ARM.Build.0 = Debug|ARM
- {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|x64.ActiveCfg = Debug|x64
- {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|x64.Build.0 = Debug|x64
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|Win32.ActiveCfg = Debug|Win32
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|Win32.Build.0 = Debug|Win32
+ {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|x64.ActiveCfg = Debug|x64
+ {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Debug|x64.Build.0 = Debug|x64
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|ARM.ActiveCfg = Release|ARM
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|ARM.Build.0 = Release|ARM
- {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|x64.ActiveCfg = Release|x64
- {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|x64.Build.0 = Release|x64
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|Win32.ActiveCfg = Release|Win32
{C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|Win32.Build.0 = Release|Win32
+ {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|x64.ActiveCfg = Release|x64
+ {C50B5B9B-C7A5-4543-B3C8-EF988D599389}.Release|x64.Build.0 = Release|x64
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|ARM.ActiveCfg = Debug|ARM
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|ARM.Build.0 = Debug|ARM
- {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|x64.ActiveCfg = Debug|x64
- {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|x64.Build.0 = Debug|x64
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|Win32.ActiveCfg = Debug|Win32
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|Win32.Build.0 = Debug|Win32
+ {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|x64.ActiveCfg = Debug|x64
+ {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Debug|x64.Build.0 = Debug|x64
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|ARM.ActiveCfg = Release|ARM
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|ARM.Build.0 = Release|ARM
- {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|x64.ActiveCfg = Release|x64
- {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|x64.Build.0 = Release|x64
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|Win32.ActiveCfg = Release|Win32
{18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|Win32.Build.0 = Release|Win32
+ {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|x64.ActiveCfg = Release|x64
+ {18A910A2-F9D8-46BF-9E92-BFEAB1D0D78C}.Release|x64.Build.0 = Release|x64
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|ARM.ActiveCfg = Debug|ARM
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|ARM.Build.0 = Debug|ARM
- {546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|x64.ActiveCfg = Debug|x64
- {546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|x64.Build.0 = Debug|x64
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|Win32.ActiveCfg = Debug|Win32
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|Win32.Build.0 = Debug|Win32
+ {546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|x64.ActiveCfg = Debug|x64
+ {546993DD-B02D-4747-93D8-98D6303DBCA0}.Debug|x64.Build.0 = Debug|x64
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|ARM.ActiveCfg = Release|ARM
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|ARM.Build.0 = Release|ARM
- {546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|x64.ActiveCfg = Release|x64
- {546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|x64.Build.0 = Release|x64
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|Win32.ActiveCfg = Release|Win32
{546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|Win32.Build.0 = Release|Win32
+ {546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|x64.ActiveCfg = Release|x64
+ {546993DD-B02D-4747-93D8-98D6303DBCA0}.Release|x64.Build.0 = Release|x64
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|ARM.ActiveCfg = Debug|ARM
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|ARM.Build.0 = Debug|ARM
- {3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|x64.ActiveCfg = Debug|x64
- {3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|x64.Build.0 = Debug|x64
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|Win32.ActiveCfg = Debug|Win32
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|Win32.Build.0 = Debug|Win32
+ {3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|x64.ActiveCfg = Debug|x64
+ {3988B59F-3A47-4895-AD0C-FB482E994A06}.Debug|x64.Build.0 = Debug|x64
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|ARM.ActiveCfg = Release|ARM
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|ARM.Build.0 = Release|ARM
- {3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|x64.ActiveCfg = Release|x64
- {3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|x64.Build.0 = Release|x64
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|Win32.ActiveCfg = Release|Win32
{3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|Win32.Build.0 = Release|Win32
+ {3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|x64.ActiveCfg = Release|x64
+ {3988B59F-3A47-4895-AD0C-FB482E994A06}.Release|x64.Build.0 = Release|x64
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|ARM.ActiveCfg = Debug|ARM
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|ARM.Build.0 = Debug|ARM
- {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|x64.ActiveCfg = Debug|x64
- {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|x64.Build.0 = Debug|x64
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|Win32.ActiveCfg = Debug|Win32
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|Win32.Build.0 = Debug|Win32
+ {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|x64.ActiveCfg = Debug|x64
+ {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Debug|x64.Build.0 = Debug|x64
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|ARM.ActiveCfg = Release|ARM
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|ARM.Build.0 = Release|ARM
- {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|x64.ActiveCfg = Release|x64
- {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|x64.Build.0 = Release|x64
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|Win32.ActiveCfg = Release|Win32
{3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|Win32.Build.0 = Release|Win32
+ {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|x64.ActiveCfg = Release|x64
+ {3A1F2FEB-08AA-473E-98B2-EC4AB2744825}.Release|x64.Build.0 = Release|x64
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|ARM.ActiveCfg = Debug|ARM
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|ARM.Build.0 = Debug|ARM
- {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|x64.ActiveCfg = Debug|x64
- {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|x64.Build.0 = Debug|x64
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|Win32.ActiveCfg = Debug|Win32
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|Win32.Build.0 = Debug|Win32
+ {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|x64.ActiveCfg = Debug|x64
+ {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Debug|x64.Build.0 = Debug|x64
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|ARM.ActiveCfg = Release|ARM
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|ARM.Build.0 = Release|ARM
- {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|x64.ActiveCfg = Release|x64
- {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|x64.Build.0 = Release|x64
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|Win32.ActiveCfg = Release|Win32
{7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|Win32.Build.0 = Release|Win32
+ {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|x64.ActiveCfg = Release|x64
+ {7F774CEE-1FAB-4A46-8CEE-DEC3E456BFF4}.Release|x64.Build.0 = Release|x64
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|ARM.ActiveCfg = Debug|ARM
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|ARM.Build.0 = Debug|ARM
- {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|x64.ActiveCfg = Debug|x64
- {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|x64.Build.0 = Debug|x64
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|Win32.ActiveCfg = Debug|Win32
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|Win32.Build.0 = Debug|Win32
+ {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|x64.ActiveCfg = Debug|x64
+ {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Debug|x64.Build.0 = Debug|x64
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|ARM.ActiveCfg = Release|ARM
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|ARM.Build.0 = Release|ARM
- {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|x64.ActiveCfg = Release|x64
- {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|x64.Build.0 = Release|x64
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|Win32.ActiveCfg = Release|Win32
{E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|Win32.Build.0 = Release|Win32
+ {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|x64.ActiveCfg = Release|x64
+ {E84E6403-5492-44C8-BCB5-C618A1F87B44}.Release|x64.Build.0 = Release|x64
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|ARM.ActiveCfg = Debug|ARM
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|ARM.Build.0 = Debug|ARM
- {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|x64.ActiveCfg = Debug|x64
- {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|x64.Build.0 = Debug|x64
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|Win32.ActiveCfg = Debug|Win32
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|Win32.Build.0 = Debug|Win32
+ {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|x64.ActiveCfg = Debug|x64
+ {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Debug|x64.Build.0 = Debug|x64
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|ARM.ActiveCfg = Release|ARM
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|ARM.Build.0 = Release|ARM
- {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|x64.ActiveCfg = Release|x64
- {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|x64.Build.0 = Release|x64
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|Win32.ActiveCfg = Release|Win32
{B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|Win32.Build.0 = Release|Win32
+ {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|x64.ActiveCfg = Release|x64
+ {B6278A73-F796-4EA1-91CC-D5D53AA93E99}.Release|x64.Build.0 = Release|x64
{21412025-433A-4C94-958A-981F42282F81}.Debug|ARM.ActiveCfg = Debug|ARM
{21412025-433A-4C94-958A-981F42282F81}.Debug|ARM.Build.0 = Debug|ARM
- {21412025-433A-4C94-958A-981F42282F81}.Debug|x64.ActiveCfg = Debug|x64
- {21412025-433A-4C94-958A-981F42282F81}.Debug|x64.Build.0 = Debug|x64
{21412025-433A-4C94-958A-981F42282F81}.Debug|Win32.ActiveCfg = Debug|Win32
{21412025-433A-4C94-958A-981F42282F81}.Debug|Win32.Build.0 = Debug|Win32
+ {21412025-433A-4C94-958A-981F42282F81}.Debug|x64.ActiveCfg = Debug|x64
+ {21412025-433A-4C94-958A-981F42282F81}.Debug|x64.Build.0 = Debug|x64
{21412025-433A-4C94-958A-981F42282F81}.Release|ARM.ActiveCfg = Release|ARM
{21412025-433A-4C94-958A-981F42282F81}.Release|ARM.Build.0 = Release|ARM
- {21412025-433A-4C94-958A-981F42282F81}.Release|x64.ActiveCfg = Release|x64
- {21412025-433A-4C94-958A-981F42282F81}.Release|x64.Build.0 = Release|x64
{21412025-433A-4C94-958A-981F42282F81}.Release|Win32.ActiveCfg = Release|Win32
{21412025-433A-4C94-958A-981F42282F81}.Release|Win32.Build.0 = Release|Win32
+ {21412025-433A-4C94-958A-981F42282F81}.Release|x64.ActiveCfg = Release|x64
+ {21412025-433A-4C94-958A-981F42282F81}.Release|x64.Build.0 = Release|x64
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|ARM.ActiveCfg = Debug|ARM
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|ARM.Build.0 = Debug|ARM
- {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|x64.ActiveCfg = Debug|x64
- {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|x64.Build.0 = Debug|x64
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|Win32.ActiveCfg = Debug|Win32
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|Win32.Build.0 = Debug|Win32
+ {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|x64.ActiveCfg = Debug|x64
+ {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Debug|x64.Build.0 = Debug|x64
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|ARM.ActiveCfg = Release|ARM
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|ARM.Build.0 = Release|ARM
- {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|x64.ActiveCfg = Release|x64
- {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|x64.Build.0 = Release|x64
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|Win32.ActiveCfg = Release|Win32
{2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|Win32.Build.0 = Release|Win32
+ {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|x64.ActiveCfg = Release|x64
+ {2A4A0B06-47E0-42F7-99BF-68B73469D246}.Release|x64.Build.0 = Release|x64
{1E98A006-96B1-44E8-B857-E946EB424151}.Debug|ARM.ActiveCfg = Debug|ARM
{1E98A006-96B1-44E8-B857-E946EB424151}.Debug|ARM.Build.0 = Debug|ARM
- {1E98A006-96B1-44E8-B857-E946EB424151}.Debug|x64.ActiveCfg = Debug|x64
- {1E98A006-96B1-44E8-B857-E946EB424151}.Debug|x64.Build.0 = Debug|x64
{1E98A006-96B1-44E8-B857-E946EB424151}.Debug|Win32.ActiveCfg = Debug|Win32
{1E98A006-96B1-44E8-B857-E946EB424151}.Debug|Win32.Build.0 = Debug|Win32
+ {1E98A006-96B1-44E8-B857-E946EB424151}.Debug|x64.ActiveCfg = Debug|x64
+ {1E98A006-96B1-44E8-B857-E946EB424151}.Debug|x64.Build.0 = Debug|x64
{1E98A006-96B1-44E8-B857-E946EB424151}.Release|ARM.ActiveCfg = Release|ARM
{1E98A006-96B1-44E8-B857-E946EB424151}.Release|ARM.Build.0 = Release|ARM
- {1E98A006-96B1-44E8-B857-E946EB424151}.Release|x64.ActiveCfg = Release|x64
- {1E98A006-96B1-44E8-B857-E946EB424151}.Release|x64.Build.0 = Release|x64
{1E98A006-96B1-44E8-B857-E946EB424151}.Release|Win32.ActiveCfg = Release|Win32
{1E98A006-96B1-44E8-B857-E946EB424151}.Release|Win32.Build.0 = Release|Win32
+ {1E98A006-96B1-44E8-B857-E946EB424151}.Release|x64.ActiveCfg = Release|x64
+ {1E98A006-96B1-44E8-B857-E946EB424151}.Release|x64.Build.0 = Release|x64
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|ARM.ActiveCfg = Debug|ARM
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|ARM.Build.0 = Debug|ARM
- {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|x64.ActiveCfg = Debug|x64
- {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|x64.Build.0 = Debug|x64
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|Win32.ActiveCfg = Debug|Win32
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|Win32.Build.0 = Debug|Win32
+ {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|x64.ActiveCfg = Debug|x64
+ {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Debug|x64.Build.0 = Debug|x64
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|ARM.ActiveCfg = Release|ARM
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|ARM.Build.0 = Release|ARM
- {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|x64.ActiveCfg = Release|x64
- {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|x64.Build.0 = Release|x64
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|Win32.ActiveCfg = Release|Win32
{38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|Win32.Build.0 = Release|Win32
+ {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|x64.ActiveCfg = Release|x64
+ {38EA5460-DFE8-4B16-AA5E-48DB92C3D573}.Release|x64.Build.0 = Release|x64
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|ARM.ActiveCfg = Debug|ARM
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|ARM.Build.0 = Debug|ARM
- {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|x64.ActiveCfg = Debug|x64
- {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|x64.Build.0 = Debug|x64
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|Win32.ActiveCfg = Debug|Win32
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|Win32.Build.0 = Debug|Win32
+ {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|x64.ActiveCfg = Debug|x64
+ {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Debug|x64.Build.0 = Debug|x64
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|ARM.ActiveCfg = Release|ARM
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|ARM.Build.0 = Release|ARM
- {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|x64.ActiveCfg = Release|x64
- {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|x64.Build.0 = Release|x64
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|Win32.ActiveCfg = Release|Win32
{C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|Win32.Build.0 = Release|Win32
+ {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|x64.ActiveCfg = Release|x64
+ {C51733CE-9792-4660-9DD3-109A9A7E37DA}.Release|x64.Build.0 = Release|x64
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|ARM.ActiveCfg = Debug|ARM
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|ARM.Build.0 = Debug|ARM
- {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|x64.ActiveCfg = Debug|x64
- {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|x64.Build.0 = Debug|x64
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|Win32.ActiveCfg = Debug|Win32
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|Win32.Build.0 = Debug|Win32
+ {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|x64.ActiveCfg = Debug|x64
+ {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Debug|x64.Build.0 = Debug|x64
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|ARM.ActiveCfg = Release|ARM
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|ARM.Build.0 = Release|ARM
- {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|x64.ActiveCfg = Release|x64
- {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|x64.Build.0 = Release|x64
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|Win32.ActiveCfg = Release|Win32
{3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|Win32.Build.0 = Release|Win32
+ {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|x64.ActiveCfg = Release|x64
+ {3E2695C6-0D3C-4E90-B85E-0AEE82118B99}.Release|x64.Build.0 = Release|x64
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|ARM.ActiveCfg = Debug|ARM
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|ARM.Build.0 = Debug|ARM
- {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|x64.ActiveCfg = Debug|x64
- {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|x64.Build.0 = Debug|x64
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|Win32.ActiveCfg = Debug|Win32
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|Win32.Build.0 = Debug|Win32
+ {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|x64.ActiveCfg = Debug|x64
+ {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Debug|x64.Build.0 = Debug|x64
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|ARM.ActiveCfg = Release|ARM
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|ARM.Build.0 = Release|ARM
- {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|x64.ActiveCfg = Release|x64
- {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|x64.Build.0 = Release|x64
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|Win32.ActiveCfg = Release|Win32
{CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|Win32.Build.0 = Release|Win32
+ {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|x64.ActiveCfg = Release|x64
+ {CB504542-79B9-4984-94A9-B0ACD4190C4A}.Release|x64.Build.0 = Release|x64
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|ARM.ActiveCfg = Debug|ARM
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|ARM.Build.0 = Debug|ARM
- {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|x64.ActiveCfg = Debug|x64
- {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|x64.Build.0 = Debug|x64
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|Win32.ActiveCfg = Debug|Win32
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|Win32.Build.0 = Debug|Win32
+ {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|x64.ActiveCfg = Debug|x64
+ {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Debug|x64.Build.0 = Debug|x64
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|ARM.ActiveCfg = Release|ARM
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|ARM.Build.0 = Release|ARM
- {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|x64.ActiveCfg = Release|x64
- {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|x64.Build.0 = Release|x64
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|Win32.ActiveCfg = Release|Win32
{68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|Win32.Build.0 = Release|Win32
+ {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|x64.ActiveCfg = Release|x64
+ {68514B7D-1CCC-4630-9DE5-C59D0965F7C3}.Release|x64.Build.0 = Release|x64
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|ARM.ActiveCfg = Debug|ARM
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|ARM.Build.0 = Debug|ARM
- {B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|x64.ActiveCfg = Debug|x64
- {B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|x64.Build.0 = Debug|x64
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|Win32.ActiveCfg = Debug|Win32
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|Win32.Build.0 = Debug|Win32
+ {B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|x64.ActiveCfg = Debug|x64
+ {B29D5544-CD86-4C7D-A28A-3757376AA198}.Debug|x64.Build.0 = Debug|x64
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|ARM.ActiveCfg = Release|ARM
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|ARM.Build.0 = Release|ARM
- {B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|x64.ActiveCfg = Release|x64
- {B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|x64.Build.0 = Release|x64
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|Win32.ActiveCfg = Release|Win32
{B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|Win32.Build.0 = Release|Win32
+ {B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|x64.ActiveCfg = Release|x64
+ {B29D5544-CD86-4C7D-A28A-3757376AA198}.Release|x64.Build.0 = Release|x64
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|ARM.ActiveCfg = Debug|ARM
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|ARM.Build.0 = Debug|ARM
- {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|x64.ActiveCfg = Debug|x64
- {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|x64.Build.0 = Debug|x64
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|Win32.ActiveCfg = Debug|Win32
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|Win32.Build.0 = Debug|Win32
+ {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|x64.ActiveCfg = Debug|x64
+ {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Debug|x64.Build.0 = Debug|x64
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|ARM.ActiveCfg = Release|ARM
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|ARM.Build.0 = Release|ARM
- {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|x64.ActiveCfg = Release|x64
- {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|x64.Build.0 = Release|x64
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|Win32.ActiveCfg = Release|Win32
{99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|Win32.Build.0 = Release|Win32
+ {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|x64.ActiveCfg = Release|x64
+ {99A2F29D-657C-497C-8F65-86E67A08FC0D}.Release|x64.Build.0 = Release|x64
{6D739820-348B-4143-A473-E9D47B48A35D}.Debug|ARM.ActiveCfg = Debug|ARM
{6D739820-348B-4143-A473-E9D47B48A35D}.Debug|ARM.Build.0 = Debug|ARM
- {6D739820-348B-4143-A473-E9D47B48A35D}.Debug|x64.ActiveCfg = Debug|x64
- {6D739820-348B-4143-A473-E9D47B48A35D}.Debug|x64.Build.0 = Debug|x64
{6D739820-348B-4143-A473-E9D47B48A35D}.Debug|Win32.ActiveCfg = Debug|Win32
{6D739820-348B-4143-A473-E9D47B48A35D}.Debug|Win32.Build.0 = Debug|Win32
+ {6D739820-348B-4143-A473-E9D47B48A35D}.Debug|x64.ActiveCfg = Debug|x64
+ {6D739820-348B-4143-A473-E9D47B48A35D}.Debug|x64.Build.0 = Debug|x64
{6D739820-348B-4143-A473-E9D47B48A35D}.Release|ARM.ActiveCfg = Release|ARM
{6D739820-348B-4143-A473-E9D47B48A35D}.Release|ARM.Build.0 = Release|ARM
- {6D739820-348B-4143-A473-E9D47B48A35D}.Release|x64.ActiveCfg = Release|x64
- {6D739820-348B-4143-A473-E9D47B48A35D}.Release|x64.Build.0 = Release|x64
{6D739820-348B-4143-A473-E9D47B48A35D}.Release|Win32.ActiveCfg = Release|Win32
{6D739820-348B-4143-A473-E9D47B48A35D}.Release|Win32.Build.0 = Release|Win32
+ {6D739820-348B-4143-A473-E9D47B48A35D}.Release|x64.ActiveCfg = Release|x64
+ {6D739820-348B-4143-A473-E9D47B48A35D}.Release|x64.Build.0 = Release|x64
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|ARM.ActiveCfg = Debug|ARM
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|ARM.Build.0 = Debug|ARM
- {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|x64.ActiveCfg = Debug|x64
- {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|x64.Build.0 = Debug|x64
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|Win32.ActiveCfg = Debug|Win32
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|Win32.Build.0 = Debug|Win32
+ {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|x64.ActiveCfg = Debug|x64
+ {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Debug|x64.Build.0 = Debug|x64
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|ARM.ActiveCfg = Release|ARM
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|ARM.Build.0 = Release|ARM
- {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|x64.ActiveCfg = Release|x64
- {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|x64.Build.0 = Release|x64
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|Win32.ActiveCfg = Release|Win32
{4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|Win32.Build.0 = Release|Win32
+ {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|x64.ActiveCfg = Release|x64
+ {4FD0E234-6987-4ED2-BA70-763B091B32B0}.Release|x64.Build.0 = Release|x64
{06E73507-19E5-4321-84A6-5735C783418A}.Debug|ARM.ActiveCfg = Debug|ARM
{06E73507-19E5-4321-84A6-5735C783418A}.Debug|ARM.Build.0 = Debug|ARM
- {06E73507-19E5-4321-84A6-5735C783418A}.Debug|x64.ActiveCfg = Debug|x64
- {06E73507-19E5-4321-84A6-5735C783418A}.Debug|x64.Build.0 = Debug|x64
{06E73507-19E5-4321-84A6-5735C783418A}.Debug|Win32.ActiveCfg = Debug|Win32
{06E73507-19E5-4321-84A6-5735C783418A}.Debug|Win32.Build.0 = Debug|Win32
+ {06E73507-19E5-4321-84A6-5735C783418A}.Debug|x64.ActiveCfg = Debug|x64
+ {06E73507-19E5-4321-84A6-5735C783418A}.Debug|x64.Build.0 = Debug|x64
{06E73507-19E5-4321-84A6-5735C783418A}.Release|ARM.ActiveCfg = Release|ARM
{06E73507-19E5-4321-84A6-5735C783418A}.Release|ARM.Build.0 = Release|ARM
- {06E73507-19E5-4321-84A6-5735C783418A}.Release|x64.ActiveCfg = Release|x64
- {06E73507-19E5-4321-84A6-5735C783418A}.Release|x64.Build.0 = Release|x64
{06E73507-19E5-4321-84A6-5735C783418A}.Release|Win32.ActiveCfg = Release|Win32
{06E73507-19E5-4321-84A6-5735C783418A}.Release|Win32.Build.0 = Release|Win32
+ {06E73507-19E5-4321-84A6-5735C783418A}.Release|x64.ActiveCfg = Release|x64
+ {06E73507-19E5-4321-84A6-5735C783418A}.Release|x64.Build.0 = Release|x64
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|ARM.ActiveCfg = Debug|ARM
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|ARM.Build.0 = Debug|ARM
- {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|x64.ActiveCfg = Debug|x64
- {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|x64.Build.0 = Debug|x64
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|Win32.ActiveCfg = Debug|Win32
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|Win32.Build.0 = Debug|Win32
+ {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|x64.ActiveCfg = Debug|x64
+ {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Debug|x64.Build.0 = Debug|x64
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|ARM.ActiveCfg = Release|ARM
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|ARM.Build.0 = Release|ARM
- {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|x64.ActiveCfg = Release|x64
- {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|x64.Build.0 = Release|x64
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|Win32.ActiveCfg = Release|Win32
{79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|Win32.Build.0 = Release|Win32
+ {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|x64.ActiveCfg = Release|x64
+ {79BC25B9-FA93-4BE0-9A1D-56A6D78346C0}.Release|x64.Build.0 = Release|x64
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|ARM.ActiveCfg = Debug|ARM
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|ARM.Build.0 = Debug|ARM
- {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|x64.ActiveCfg = Debug|x64
- {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|x64.Build.0 = Debug|x64
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|Win32.ActiveCfg = Debug|Win32
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|Win32.Build.0 = Debug|Win32
+ {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|x64.ActiveCfg = Debug|x64
+ {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Debug|x64.Build.0 = Debug|x64
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|ARM.ActiveCfg = Release|ARM
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|ARM.Build.0 = Release|ARM
- {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|x64.ActiveCfg = Release|x64
- {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|x64.Build.0 = Release|x64
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|Win32.ActiveCfg = Release|Win32
{3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|Win32.Build.0 = Release|Win32
+ {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|x64.ActiveCfg = Release|x64
+ {3F0C80F0-228B-484C-8D70-20BDA1F02EF0}.Release|x64.Build.0 = Release|x64
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|ARM.ActiveCfg = Debug|ARM
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|ARM.Build.0 = Debug|ARM
- {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|x64.ActiveCfg = Debug|x64
- {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|x64.Build.0 = Debug|x64
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|Win32.ActiveCfg = Debug|Win32
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|Win32.Build.0 = Debug|Win32
+ {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|x64.ActiveCfg = Debug|x64
+ {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Debug|x64.Build.0 = Debug|x64
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|ARM.ActiveCfg = Release|ARM
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|ARM.Build.0 = Release|ARM
- {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|x64.ActiveCfg = Release|x64
- {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|x64.Build.0 = Release|x64
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|Win32.ActiveCfg = Release|Win32
{1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|Win32.Build.0 = Release|Win32
+ {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|x64.ActiveCfg = Release|x64
+ {1766DCA9-A8E4-48F7-AC58-BE85C627BF1E}.Release|x64.Build.0 = Release|x64
{651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|ARM.ActiveCfg = Debug|ARM
{651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|ARM.Build.0 = Debug|ARM
- {651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|x64.ActiveCfg = Debug|x64
- {651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|x64.Build.0 = Debug|x64
{651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|Win32.ActiveCfg = Debug|Win32
{651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|Win32.Build.0 = Debug|Win32
+ {651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|x64.ActiveCfg = Debug|x64
+ {651CD011-09F7-481E-8260-36D2FA3A6788}.Debug|x64.Build.0 = Debug|x64
{651CD011-09F7-481E-8260-36D2FA3A6788}.Release|ARM.ActiveCfg = Release|ARM
{651CD011-09F7-481E-8260-36D2FA3A6788}.Release|ARM.Build.0 = Release|ARM
- {651CD011-09F7-481E-8260-36D2FA3A6788}.Release|x64.ActiveCfg = Release|x64
- {651CD011-09F7-481E-8260-36D2FA3A6788}.Release|x64.Build.0 = Release|x64
{651CD011-09F7-481E-8260-36D2FA3A6788}.Release|Win32.ActiveCfg = Release|Win32
{651CD011-09F7-481E-8260-36D2FA3A6788}.Release|Win32.Build.0 = Release|Win32
+ {651CD011-09F7-481E-8260-36D2FA3A6788}.Release|x64.ActiveCfg = Release|x64
+ {651CD011-09F7-481E-8260-36D2FA3A6788}.Release|x64.Build.0 = Release|x64
{D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|ARM.ActiveCfg = Debug|ARM
{D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|ARM.Build.0 = Debug|ARM
- {D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|x64.ActiveCfg = Debug|x64
- {D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|x64.Build.0 = Debug|x64
{D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|Win32.ActiveCfg = Debug|Win32
{D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|Win32.Build.0 = Debug|Win32
+ {D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|x64.ActiveCfg = Debug|x64
+ {D9CB8E99-B855-4919-9118-3849BD01F644}.Debug|x64.Build.0 = Debug|x64
{D9CB8E99-B855-4919-9118-3849BD01F644}.Release|ARM.ActiveCfg = Release|ARM
{D9CB8E99-B855-4919-9118-3849BD01F644}.Release|ARM.Build.0 = Release|ARM
- {D9CB8E99-B855-4919-9118-3849BD01F644}.Release|x64.ActiveCfg = Release|x64
- {D9CB8E99-B855-4919-9118-3849BD01F644}.Release|x64.Build.0 = Release|x64
{D9CB8E99-B855-4919-9118-3849BD01F644}.Release|Win32.ActiveCfg = Release|Win32
{D9CB8E99-B855-4919-9118-3849BD01F644}.Release|Win32.Build.0 = Release|Win32
+ {D9CB8E99-B855-4919-9118-3849BD01F644}.Release|x64.ActiveCfg = Release|x64
+ {D9CB8E99-B855-4919-9118-3849BD01F644}.Release|x64.Build.0 = Release|x64
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|ARM.ActiveCfg = Debug|ARM
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|ARM.Build.0 = Debug|ARM
- {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|x64.ActiveCfg = Debug|x64
- {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|x64.Build.0 = Debug|x64
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|Win32.ActiveCfg = Debug|Win32
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|Win32.Build.0 = Debug|Win32
+ {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|x64.ActiveCfg = Debug|x64
+ {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Debug|x64.Build.0 = Debug|x64
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|ARM.ActiveCfg = Release|ARM
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|ARM.Build.0 = Release|ARM
- {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|x64.ActiveCfg = Release|x64
- {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|x64.Build.0 = Release|x64
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|Win32.ActiveCfg = Release|Win32
{48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|Win32.Build.0 = Release|Win32
+ {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|x64.ActiveCfg = Release|x64
+ {48607CAC-FD1D-4C1F-8266-5FCBAEDBA49F}.Release|x64.Build.0 = Release|x64
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|ARM.ActiveCfg = Debug|ARM
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|ARM.Build.0 = Debug|ARM
- {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|x64.ActiveCfg = Debug|x64
- {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|x64.Build.0 = Debug|x64
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|Win32.ActiveCfg = Debug|Win32
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|Win32.Build.0 = Debug|Win32
+ {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|x64.ActiveCfg = Debug|x64
+ {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Debug|x64.Build.0 = Debug|x64
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|ARM.ActiveCfg = Release|ARM
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|ARM.Build.0 = Release|ARM
- {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|x64.ActiveCfg = Release|x64
- {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|x64.Build.0 = Release|x64
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|Win32.ActiveCfg = Release|Win32
{3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|Win32.Build.0 = Release|Win32
+ {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|x64.ActiveCfg = Release|x64
+ {3082831B-0F5B-45FA-B208-4B3EB15C7213}.Release|x64.Build.0 = Release|x64
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|ARM.ActiveCfg = Debug|ARM
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|ARM.Build.0 = Debug|ARM
- {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|x64.ActiveCfg = Debug|x64
- {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|x64.Build.0 = Debug|x64
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|Win32.ActiveCfg = Debug|Win32
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|Win32.Build.0 = Debug|Win32
+ {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|x64.ActiveCfg = Debug|x64
+ {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Debug|x64.Build.0 = Debug|x64
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|ARM.ActiveCfg = Release|ARM
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|ARM.Build.0 = Release|ARM
- {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|x64.ActiveCfg = Release|x64
- {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|x64.Build.0 = Release|x64
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|Win32.ActiveCfg = Release|Win32
{EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|Win32.Build.0 = Release|Win32
+ {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|x64.ActiveCfg = Release|x64
+ {EFCC1D05-4C95-43F8-8AE8-FDCE6006AA09}.Release|x64.Build.0 = Release|x64
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|ARM.ActiveCfg = Debug|ARM
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|ARM.Build.0 = Debug|ARM
- {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|x64.ActiveCfg = Debug|x64
- {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|x64.Build.0 = Debug|x64
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|Win32.ActiveCfg = Debug|Win32
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|Win32.Build.0 = Debug|Win32
+ {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|x64.ActiveCfg = Debug|x64
+ {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Debug|x64.Build.0 = Debug|x64
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|ARM.ActiveCfg = Release|ARM
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|ARM.Build.0 = Release|ARM
- {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|x64.ActiveCfg = Release|x64
- {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|x64.Build.0 = Release|x64
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|Win32.ActiveCfg = Release|Win32
{A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|Win32.Build.0 = Release|Win32
+ {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|x64.ActiveCfg = Release|x64
+ {A1D1EC5B-CCE1-4F8B-8181-2703DC33C129}.Release|x64.Build.0 = Release|x64
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|ARM.ActiveCfg = Debug|ARM
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|ARM.Build.0 = Debug|ARM
- {8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|x64.ActiveCfg = Debug|x64
- {8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|x64.Build.0 = Debug|x64
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|Win32.ActiveCfg = Debug|Win32
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|Win32.Build.0 = Debug|Win32
+ {8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|x64.ActiveCfg = Debug|x64
+ {8D070872-BB4D-422C-908A-890D0EBFEB65}.Debug|x64.Build.0 = Debug|x64
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|ARM.ActiveCfg = Release|ARM
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|ARM.Build.0 = Release|ARM
- {8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|x64.ActiveCfg = Release|x64
- {8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|x64.Build.0 = Release|x64
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|Win32.ActiveCfg = Release|Win32
{8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|Win32.Build.0 = Release|Win32
+ {8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|x64.ActiveCfg = Release|x64
+ {8D070872-BB4D-422C-908A-890D0EBFEB65}.Release|x64.Build.0 = Release|x64
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|ARM.ActiveCfg = Debug|ARM
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|ARM.Build.0 = Debug|ARM
- {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|x64.ActiveCfg = Debug|x64
- {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|x64.Build.0 = Debug|x64
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|Win32.ActiveCfg = Debug|Win32
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|Win32.Build.0 = Debug|Win32
+ {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|x64.ActiveCfg = Debug|x64
+ {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Debug|x64.Build.0 = Debug|x64
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|ARM.ActiveCfg = Release|ARM
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|ARM.Build.0 = Release|ARM
- {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|x64.ActiveCfg = Release|x64
- {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|x64.Build.0 = Release|x64
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|Win32.ActiveCfg = Release|Win32
{5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|Win32.Build.0 = Release|Win32
+ {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|x64.ActiveCfg = Release|x64
+ {5B0CB644-6A43-4E6E-A4F1-7D0C5A4FB4B9}.Release|x64.Build.0 = Release|x64
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|ARM.ActiveCfg = Debug|ARM
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|ARM.Build.0 = Debug|ARM
- {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|x64.ActiveCfg = Debug|x64
- {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|x64.Build.0 = Debug|x64
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|Win32.ActiveCfg = Debug|Win32
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|Win32.Build.0 = Debug|Win32
+ {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|x64.ActiveCfg = Debug|x64
+ {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Debug|x64.Build.0 = Debug|x64
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|ARM.ActiveCfg = Release|ARM
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|ARM.Build.0 = Release|ARM
- {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|x64.ActiveCfg = Release|x64
- {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|x64.Build.0 = Release|x64
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|Win32.ActiveCfg = Release|Win32
{C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|Win32.Build.0 = Release|Win32
+ {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|x64.ActiveCfg = Release|x64
+ {C35ED1F9-F687-43AF-9C6F-F67F371BA785}.Release|x64.Build.0 = Release|x64
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|ARM.ActiveCfg = Debug|ARM
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|ARM.Build.0 = Debug|ARM
- {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|x64.ActiveCfg = Debug|x64
- {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|x64.Build.0 = Debug|x64
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|Win32.ActiveCfg = Debug|Win32
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|Win32.Build.0 = Debug|Win32
+ {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|x64.ActiveCfg = Debug|x64
+ {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Debug|x64.Build.0 = Debug|x64
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|ARM.ActiveCfg = Release|ARM
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|ARM.Build.0 = Release|ARM
- {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|x64.ActiveCfg = Release|x64
- {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|x64.Build.0 = Release|x64
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|Win32.ActiveCfg = Release|Win32
{8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|Win32.Build.0 = Release|Win32
+ {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|x64.ActiveCfg = Release|x64
+ {8F60A767-5501-4763-AC0D-2D61B326A2AD}.Release|x64.Build.0 = Release|x64
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|ARM.ActiveCfg = Debug|ARM
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|ARM.Build.0 = Debug|ARM
- {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|x64.ActiveCfg = Debug|x64
- {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|x64.Build.0 = Debug|x64
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|Win32.ActiveCfg = Debug|Win32
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|Win32.Build.0 = Debug|Win32
+ {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|x64.ActiveCfg = Debug|x64
+ {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Debug|x64.Build.0 = Debug|x64
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|ARM.ActiveCfg = Release|ARM
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|ARM.Build.0 = Release|ARM
- {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|x64.ActiveCfg = Release|x64
- {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|x64.Build.0 = Release|x64
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|Win32.ActiveCfg = Release|Win32
{45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|Win32.Build.0 = Release|Win32
+ {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|x64.ActiveCfg = Release|x64
+ {45DC21D4-9996-4D22-8D81-5D3F4782625C}.Release|x64.Build.0 = Release|x64
{635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|ARM.ActiveCfg = Debug|ARM
{635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|ARM.Build.0 = Debug|ARM
- {635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|x64.ActiveCfg = Debug|x64
- {635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|x64.Build.0 = Debug|x64
{635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|Win32.ActiveCfg = Debug|Win32
{635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|Win32.Build.0 = Debug|Win32
+ {635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|x64.ActiveCfg = Debug|x64
+ {635F90F0-03C1-4391-8988-1E09361DBB50}.Debug|x64.Build.0 = Debug|x64
{635F90F0-03C1-4391-8988-1E09361DBB50}.Release|ARM.ActiveCfg = Release|ARM
{635F90F0-03C1-4391-8988-1E09361DBB50}.Release|ARM.Build.0 = Release|ARM
- {635F90F0-03C1-4391-8988-1E09361DBB50}.Release|x64.ActiveCfg = Release|x64
- {635F90F0-03C1-4391-8988-1E09361DBB50}.Release|x64.Build.0 = Release|x64
{635F90F0-03C1-4391-8988-1E09361DBB50}.Release|Win32.ActiveCfg = Release|Win32
{635F90F0-03C1-4391-8988-1E09361DBB50}.Release|Win32.Build.0 = Release|Win32
+ {635F90F0-03C1-4391-8988-1E09361DBB50}.Release|x64.ActiveCfg = Release|x64
+ {635F90F0-03C1-4391-8988-1E09361DBB50}.Release|x64.Build.0 = Release|x64
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|ARM.ActiveCfg = Debug|ARM
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|ARM.Build.0 = Debug|ARM
- {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|x64.ActiveCfg = Debug|x64
- {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|x64.Build.0 = Debug|x64
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|Win32.ActiveCfg = Debug|Win32
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|Win32.Build.0 = Debug|Win32
+ {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|x64.ActiveCfg = Debug|x64
+ {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Debug|x64.Build.0 = Debug|x64
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|ARM.ActiveCfg = Release|ARM
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|ARM.Build.0 = Release|ARM
- {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|x64.ActiveCfg = Release|x64
- {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|x64.Build.0 = Release|x64
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|Win32.ActiveCfg = Release|Win32
{C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|Win32.Build.0 = Release|Win32
+ {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|x64.ActiveCfg = Release|x64
+ {C34F2478-0E9F-412A-BAA8-C4B566404EB9}.Release|x64.Build.0 = Release|x64
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|ARM.ActiveCfg = Debug|ARM
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|ARM.Build.0 = Debug|ARM
- {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|x64.ActiveCfg = Debug|x64
- {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|x64.Build.0 = Debug|x64
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|Win32.ActiveCfg = Debug|Win32
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|Win32.Build.0 = Debug|Win32
+ {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|x64.ActiveCfg = Debug|x64
+ {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Debug|x64.Build.0 = Debug|x64
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|ARM.ActiveCfg = Release|ARM
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|ARM.Build.0 = Release|ARM
- {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|x64.ActiveCfg = Release|x64
- {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|x64.Build.0 = Release|x64
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|Win32.ActiveCfg = Release|Win32
{086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|Win32.Build.0 = Release|Win32
+ {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|x64.ActiveCfg = Release|x64
+ {086C6266-9B9B-49D3-B621-B7DAC16846DE}.Release|x64.Build.0 = Release|x64
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|ARM.ActiveCfg = Debug|ARM
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|ARM.Build.0 = Debug|ARM
- {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|x64.ActiveCfg = Debug|x64
- {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|x64.Build.0 = Debug|x64
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|Win32.ActiveCfg = Debug|Win32
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|Win32.Build.0 = Debug|Win32
+ {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|x64.ActiveCfg = Debug|x64
+ {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Debug|x64.Build.0 = Debug|x64
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|ARM.ActiveCfg = Release|ARM
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|ARM.Build.0 = Release|ARM
- {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|x64.ActiveCfg = Release|x64
- {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|x64.Build.0 = Release|x64
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|Win32.ActiveCfg = Release|Win32
{A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|Win32.Build.0 = Release|Win32
+ {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|x64.ActiveCfg = Release|x64
+ {A23E797B-E45B-4964-947F-0EE75ACDC8D9}.Release|x64.Build.0 = Release|x64
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Debug|ARM.ActiveCfg = Debug|Win32
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Debug|Win32.Build.0 = Debug|Win32
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Debug|x64.ActiveCfg = Debug|x64
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Debug|x64.Build.0 = Debug|x64
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Release|ARM.ActiveCfg = Release|Win32
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Release|Win32.ActiveCfg = Release|Win32
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Release|Win32.Build.0 = Release|Win32
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Release|x64.ActiveCfg = Release|x64
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB}.Release|x64.Build.0 = Release|x64
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Debug|ARM.ActiveCfg = Debug|Win32
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Debug|Win32.ActiveCfg = Debug|Win32
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Debug|Win32.Build.0 = Debug|Win32
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Debug|x64.ActiveCfg = Debug|x64
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Debug|x64.Build.0 = Debug|x64
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Release|ARM.ActiveCfg = Release|Win32
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Release|Win32.ActiveCfg = Release|Win32
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Release|Win32.Build.0 = Release|Win32
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Release|x64.ActiveCfg = Release|x64
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450}.Release|x64.Build.0 = Release|x64
+ {A357766C-B425-4898-883D-2D20C77A1749}.Debug|ARM.ActiveCfg = Debug|Win32
+ {A357766C-B425-4898-883D-2D20C77A1749}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A357766C-B425-4898-883D-2D20C77A1749}.Debug|Win32.Build.0 = Debug|Win32
+ {A357766C-B425-4898-883D-2D20C77A1749}.Debug|x64.ActiveCfg = Debug|x64
+ {A357766C-B425-4898-883D-2D20C77A1749}.Debug|x64.Build.0 = Debug|x64
+ {A357766C-B425-4898-883D-2D20C77A1749}.Release|ARM.ActiveCfg = Release|Win32
+ {A357766C-B425-4898-883D-2D20C77A1749}.Release|Win32.ActiveCfg = Release|Win32
+ {A357766C-B425-4898-883D-2D20C77A1749}.Release|Win32.Build.0 = Release|Win32
+ {A357766C-B425-4898-883D-2D20C77A1749}.Release|x64.ActiveCfg = Release|x64
+ {A357766C-B425-4898-883D-2D20C77A1749}.Release|x64.Build.0 = Release|x64
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Debug|ARM.ActiveCfg = Debug|ARM
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Debug|ARM.Build.0 = Debug|ARM
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Debug|Win32.Build.0 = Debug|Win32
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Debug|x64.ActiveCfg = Debug|x64
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Debug|x64.Build.0 = Debug|x64
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Release|ARM.ActiveCfg = Release|ARM
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Release|ARM.Build.0 = Release|ARM
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Release|Win32.ActiveCfg = Release|Win32
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Release|Win32.Build.0 = Release|Win32
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Release|x64.ActiveCfg = Release|x64
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1254,5 +1308,10 @@ Global
{C34F2478-0E9F-412A-BAA8-C4B566404EB9} = {EC27CDD9-736F-4197-A6BE-E82B7F083FC3}
{086C6266-9B9B-49D3-B621-B7DAC16846DE} = {EC27CDD9-736F-4197-A6BE-E82B7F083FC3}
{A23E797B-E45B-4964-947F-0EE75ACDC8D9} = {EC27CDD9-736F-4197-A6BE-E82B7F083FC3}
+ {2CEA682E-6F84-4EBC-9F35-4987A63BEEBB} = {D1072257-7B2C-4731-9392-672A80BA968A}
+ {260FAC2F-76C9-4B2D-AF70-B722B2B5D450} = {D1072257-7B2C-4731-9392-672A80BA968A}
+ {A357766C-B425-4898-883D-2D20C77A1749} = {D1072257-7B2C-4731-9392-672A80BA968A}
+ {FD49C04F-BA73-4AA5-BBD2-FAC6CB6DEA10} = {01B45DA0-1D88-4840-9FBD-3777512BB270}
+ {A1D10DF9-8010-45BF-9E96-07C8949174C6} = {FD49C04F-BA73-4AA5-BBD2-FAC6CB6DEA10}
EndGlobalSection
EndGlobal
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj
index eabd5dd47f8..980adc45771 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
index fe7360f15ef..8c7221d57e3 100644
--- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
+++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj
index 973421c5f17..3393680fb77 100644
--- a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj
+++ b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
index 7b26852bff6..34daecfe982 100644
--- a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj
index e2d99fb2c45..8196151d530 100644
--- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
index 9b3576058e0..2387a31de6f 100644
--- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj
index 08cb5a01bc6..ae5a5a761bb 100644
--- a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj
+++ b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj
@@ -32,12 +32,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
- <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
<IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
<IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj
index b4febbba83c..138951b2cc7 100644
--- a/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj
+++ b/cpp/test/Common/msbuild/uwp/testcommonuwp++11.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -210,4 +211,10 @@
<Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
index 006aa58ec4d..7e1418eb1f9 100644
--- a/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -257,4 +258,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
index 846a2faeaf8..b9d4a21ff1a 100644
--- a/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj
index 1354d0db124..1b59c345754 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj
index c5a56ba1498..67be8b29176 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -261,4 +262,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj
index 94909ff15fc..b84fef406ca 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -265,4 +266,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj
index a128e7da688..0f7e39ed1f5 100644
--- a/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/admin/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -257,4 +258,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj
index 4504af04cce..cafa8968ef9 100644
--- a/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/admin/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj
index 83df3943471..a96a93fa409 100644
--- a/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/ami/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj
index 6e120f3e520..8ceb9b1a542 100644
--- a/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/ami/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -259,4 +260,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj
index 8a9786ba779..d04cadac25b 100644
--- a/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/ami/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj
index 0642d40aa30..bdb6a3685de 100644
--- a/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/binding/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj
index a1ee54572a0..c4b033aac7a 100644
--- a/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/binding/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj
index 3990395b652..3abb12e35f5 100644
--- a/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/dispatcher/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -259,4 +260,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj
index d1dbfb5946f..c285a5ebd68 100644
--- a/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/dispatcher/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -261,4 +262,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj
index ad6a19d1b72..95eb2042000 100644
--- a/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/dispatcher/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -265,4 +266,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj
index 17aa4f1c729..2241096c344 100644
--- a/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/enums/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -257,4 +258,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj
index bbcd290d1c2..338bce28478 100644
--- a/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/enums/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj
index 02633866db1..0a11ae96317 100644
--- a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -228,4 +229,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj
index 2e063a3c801..b43d80bb8fe 100644
--- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -260,4 +261,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj
index 123d1096e45..1ee42e0c015 100644
--- a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -264,4 +265,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
index 4edbd0a2d89..56e14114afc 100644
--- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -265,4 +266,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj
index 843b32b01f5..dda21a6fb09 100644
--- a/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/facets/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj
index 17165d31cbc..2e6b4567d8b 100644
--- a/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/facets/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -259,4 +260,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj
index 81ab22caae4..2937370f72f 100644
--- a/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/facets/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj
index 727ada1f439..865e0bc4da1 100644
--- a/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj
+++ b/cpp/test/Ice/hash/msbuild/uwp/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -256,4 +257,10 @@
<Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj
index 759cfc873df..876edd70183 100644
--- a/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/hold/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj
index c45d8a30f04..054dfbe573d 100644
--- a/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/hold/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj
index 28bfd8c81ae..c6fa23c87ee 100644
--- a/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/info/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -257,4 +258,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj
index 00b65281a38..e15b19493e8 100644
--- a/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/info/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj
index fb19371653a..8e979d1f762 100644
--- a/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/inheritance/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj
index c311b5f11d7..3e75f4e9d75 100644
--- a/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/inheritance/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -259,4 +260,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj
index 370281d4fa4..5855be47be1 100644
--- a/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/inheritance/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj
index c320b75ce6c..3dbdbae942e 100644
--- a/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/invoke/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj
index 5dfd3397d08..9bcceb26327 100644
--- a/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/invoke/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj
index 2d98a2ded01..7335e9581c0 100644
--- a/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/location/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj
index 49d37ef849a..561113c24be 100644
--- a/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/location/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -265,4 +266,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj
index b387043dc09..73c019edfbe 100644
--- a/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/metrics/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -258,4 +259,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj
index 40f1e52627a..b513b47acd6 100644
--- a/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/metrics/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -260,4 +261,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj
index 8c21f092a01..b48d495bbd6 100644
--- a/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/metrics/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj
index 7359df72273..80b09363031 100644
--- a/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/metrics/msbuild/uwp/serveramd/serveramd.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -264,4 +265,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj
index 4153d8730d5..47cfc4c8142 100644
--- a/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/objects/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -432,4 +433,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj
index 86176b597dd..a439a9f4ddb 100644
--- a/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/objects/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -433,4 +434,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj
index 86626e2b973..ae592c30c09 100644
--- a/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/objects/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -437,4 +438,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj
index e0355c1ad6d..6938b93fe94 100644
--- a/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj
index f468d42c5c2..a5b7a4f77bc 100644
--- a/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -271,4 +272,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj
index 0d1e29e3bc3..4334aacb2fd 100644
--- a/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -269,4 +270,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj
index 07b0f6f9b5b..ba8919645f4 100644
--- a/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/uwp/serveramd/serveramd.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -276,4 +277,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj
index e8a2a32fdd6..1f1f32ae372 100644
--- a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj
@@ -25,9 +25,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -52,7 +55,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" />
+ <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
@@ -85,21 +88,25 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -152,5 +159,11 @@
</ClInclude>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" />
+ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj.filters b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj.filters
index 96fa1fc109a..b402df07c9d 100644
--- a/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj.filters
+++ b/cpp/test/Ice/optional/msbuild/uwp/client/client.vcxproj.filters
@@ -29,6 +29,7 @@
</Filter>
<Filter Include="Slice Files">
<UniqueIdentifier>{0d4ffefc-13f3-4c53-a437-a35927d441c2}</UniqueIdentifier>
+ <Extensions>ice</Extensions>
</Filter>
<Filter Include="Source Files\Win32">
<UniqueIdentifier>{2ad0797f-cf63-45f9-bee8-6be18fbba7e2}</UniqueIdentifier>
diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj
index 4257d4b37a4..a050a3d8950 100644
--- a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj
@@ -25,9 +25,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -52,7 +55,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" />
+ <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
@@ -86,16 +89,19 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
<Link>
<WindowsMetadataFile />
@@ -105,6 +111,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -158,5 +165,11 @@
</ClInclude>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" />
+ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj.filters b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj.filters
index aa6aa65041b..72bba286160 100644
--- a/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj.filters
+++ b/cpp/test/Ice/optional/msbuild/uwp/server/server.vcxproj.filters
@@ -29,6 +29,7 @@
</Filter>
<Filter Include="Slice Files">
<UniqueIdentifier>{6f6474fa-6b0c-422c-8a32-f0c5c2e9d713}</UniqueIdentifier>
+ <Extensions>ice</Extensions>
</Filter>
<Filter Include="Source Files\Win32">
<UniqueIdentifier>{faa93517-f0d1-4e5f-b5f6-fdac0b5b2c28}</UniqueIdentifier>
diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj
index 42145e3f6c9..412d90743ca 100644
--- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj
@@ -25,9 +25,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -52,7 +55,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" />
+ <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
@@ -86,24 +89,28 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -157,5 +164,11 @@
<IceBuilder Include="..\..\..\TestAMD.ice" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" />
+ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj.filters b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj.filters
index d7ed4009b72..007b381b0d1 100644
--- a/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj.filters
+++ b/cpp/test/Ice/optional/msbuild/uwp/serveramd/serveramd.vcxproj.filters
@@ -29,6 +29,7 @@
</Filter>
<Filter Include="Slice Files">
<UniqueIdentifier>{4ef46419-a79c-4634-b765-9b3251536943}</UniqueIdentifier>
+ <Extensions>ice</Extensions>
</Filter>
<Filter Include="Source Files\Win32">
<UniqueIdentifier>{28dddc32-34f4-43ab-9152-34f8dabab54e}</UniqueIdentifier>
diff --git a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj
index 11abc197c37..bb5bf2da5bd 100644
--- a/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/proxy/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -227,4 +228,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj
index cfcea4bd874..b7e4755ace9 100644
--- a/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/proxy/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -259,4 +260,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj
index 2e6669b79de..d76818276ef 100644
--- a/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/proxy/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj
index 4a06f10fdcb..932edee2791 100644
--- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -264,4 +265,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj
index 6fcba9bf79b..e337e7ec76a 100644
--- a/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/retry/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -260,4 +261,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj
index 2c17b8cd63e..147cb7c8793 100644
--- a/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/retry/msbuild/uwp/collocated/collocated.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -262,4 +263,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj
index 15d60cef3ef..7ad14e2b700 100644
--- a/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/retry/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -266,4 +267,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj
index e10d12eda29..83b4b82f86c 100644
--- a/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj
+++ b/cpp/test/Ice/stream/msbuild/uwp/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -256,4 +257,10 @@
<Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj
index f9dedea88ac..32663fa818f 100644
--- a/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/timeout/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -258,4 +259,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj
index 35f10f96da6..b1a1180bf33 100644
--- a/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/timeout/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj
index ff3302997a4..856d13cacba 100644
--- a/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj
+++ b/cpp/test/Ice/udp/msbuild/uwp/client/client.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -257,4 +258,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj
index 358706dd4bc..8747b47aaa0 100644
--- a/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj
+++ b/cpp/test/Ice/udp/msbuild/uwp/server/server.vcxproj
@@ -34,11 +34,12 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -263,4 +264,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj
new file mode 100644
index 00000000000..6dde51110bf
--- /dev/null
+++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props') and '$(UseNugetBinDist)' == 'yes'" />
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM">
+ <Configuration>Release</Configuration>
+ <Platform>ARM</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A1D10DF9-8010-45BF-9E96-07C8949174C6}</ProjectGuid>
+ <Keyword>DynamicLibrary</Keyword>
+ <DefaultLanguage>en-US</DefaultLanguage>
+ <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+ <AppContainerApplication>true</AppContainerApplication>
+ <ApplicationType>Windows Store</ApplicationType>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+ <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" />
+ <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets') and '$(UseNugetBinDist)' == 'yes'" />
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets') and '$(UseNugetBinDist)' == 'yes'" />
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets') and '$(UseNugetBinDist)' == 'yes'" />
+ <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets') and '$(UseNugetBinDist)' == 'yes'" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <TargetName>IceSSL_configuration_client</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <TargetName>IceSSL_configuration_client</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <TargetName>IceSSL_configuration_client</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+ <TargetName>IceSSL_configuration_client</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>IceSSL_configuration_client</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+ <TargetName>IceSSL_configuration_client</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\AllTests.cpp" />
+ <ClCompile Include="..\..\..\Client.cpp" />
+ <ClCompile Include="ARM\Debug\Test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="ARM\Release\Test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="Win32\Debug\Test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="Win32\Release\Test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="x64\Debug\Test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="x64\Release\Test.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <IceBuilder Include="..\..\..\Test.ice" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="ARM\Debug\Test.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="ARM\Release\Test.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="Win32\Debug\Test.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="Win32\Release\Test.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="x64\Debug\Test.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="x64\Release\Test.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha3\build\native\zeroc.ice.uwp.arm.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha3\build\native\zeroc.ice.uwp.x64.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha3\build\native\zeroc.ice.uwp.x86.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
+ </Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
+</Project> \ No newline at end of file
diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj.filters b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj.filters
new file mode 100644
index 00000000000..7031f0dc95d
--- /dev/null
+++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/client.vcxproj.filters
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\..\..\AllTests.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Client.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Win32\Debug\Test.cpp">
+ <Filter>Source Files\Win32\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="ARM\Debug\Test.cpp">
+ <Filter>Source Files\ARM\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="x64\Debug\Test.cpp">
+ <Filter>Source Files\x64\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="Win32\Release\Test.cpp">
+ <Filter>Source Files\Win32\Release</Filter>
+ </ClCompile>
+ <ClCompile Include="ARM\Release\Test.cpp">
+ <Filter>Source Files\ARM\Release</Filter>
+ </ClCompile>
+ <ClCompile Include="x64\Release\Test.cpp">
+ <Filter>Source Files\x64\Release</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{836d4434-6c8a-4632-8dae-9b120b0903dc}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{3bd3b2d8-2d4e-4292-a08b-26404d71f5f3}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Slice Files">
+ <UniqueIdentifier>{91d98c71-9df7-4cfa-96ed-8232cc26f61e}</UniqueIdentifier>
+ <Extensions>ice</Extensions>
+ </Filter>
+ <Filter Include="Source Files\Win32">
+ <UniqueIdentifier>{798128d4-bb66-4218-b7ff-589cdf58b85c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Win32\Debug">
+ <UniqueIdentifier>{4df2dcf6-9b4d-4d99-a24d-5ceb008a5bab}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Win32">
+ <UniqueIdentifier>{0567c87e-c3a9-468e-9cea-3503d0cb74d9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Win32\Debug">
+ <UniqueIdentifier>{3a7aced9-2363-4177-82a3-83b2c2730a96}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\ARM">
+ <UniqueIdentifier>{4f25be71-06b3-43b6-968b-b018481d1c73}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\ARM\Debug">
+ <UniqueIdentifier>{a567920c-0c07-46a9-9141-15440d52d4f2}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\ARM">
+ <UniqueIdentifier>{a6b1ab0d-0432-4fc0-9b17-270957e17dfe}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\ARM\Debug">
+ <UniqueIdentifier>{4cfb58e7-7911-4711-83cd-da738803dddc}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\x64">
+ <UniqueIdentifier>{235d4d11-8a9a-4bd2-830c-646c6badc226}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\x64\Debug">
+ <UniqueIdentifier>{115cd867-631b-4767-bb9f-cbe2bf9d77f5}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\x64">
+ <UniqueIdentifier>{4a9a4161-724b-4988-8f92-4d71c90b1793}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\x64\Debug">
+ <UniqueIdentifier>{36f9a58c-67a1-45dd-8711-f6c7b870498c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Win32\Release">
+ <UniqueIdentifier>{03f7cf7b-56e7-4923-a851-0f0126307428}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Win32\Release">
+ <UniqueIdentifier>{7a3f3cfb-cc03-4c71-8a49-82c4dc18c134}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\ARM\Release">
+ <UniqueIdentifier>{59113ce1-bb0b-48eb-a490-718e35f48991}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\ARM\Release">
+ <UniqueIdentifier>{82367ab1-0abd-4029-80e8-f824599cc39d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\x64\Release">
+ <UniqueIdentifier>{b0844f88-23a8-4c56-ac6d-7ccd7bc4660e}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\x64\Release">
+ <UniqueIdentifier>{d418fb01-6726-4390-9df6-dde2d8f0997c}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <IceBuilder Include="..\..\..\Test.ice">
+ <Filter>Slice Files</Filter>
+ </IceBuilder>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Win32\Debug\Test.h">
+ <Filter>Header Files\Win32\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="ARM\Debug\Test.h">
+ <Filter>Header Files\ARM\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="x64\Debug\Test.h">
+ <Filter>Header Files\x64\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="Win32\Release\Test.h">
+ <Filter>Header Files\Win32\Release</Filter>
+ </ClInclude>
+ <ClInclude Include="ARM\Release\Test.h">
+ <Filter>Header Files\ARM\Release</Filter>
+ </ClInclude>
+ <ClInclude Include="x64\Release\Test.h">
+ <Filter>Header Files\x64\Release</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config b/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config
new file mode 100644
index 00000000000..2129449ef4e
--- /dev/null
+++ b/cpp/test/IceSSL/configuration/msbuild/uwp/client/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="zeroc.ice.uwp" version="3.7.0-alpha3" targetFramework="native" />
+ <package id="zeroc.ice.uwp.arm" version="3.7.0-alpha3" targetFramework="native" />
+ <package id="zeroc.ice.uwp.x64" version="3.7.0-alpha3" targetFramework="native" />
+ <package id="zeroc.ice.uwp.x86" version="3.7.0-alpha3" targetFramework="native" />
+</packages> \ No newline at end of file
diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj b/cpp/test/uwp/msbuild/uwp.vcxproj
index 0e90cf60c65..8afb079a43c 100644
--- a/cpp/test/uwp/msbuild/uwp.vcxproj
+++ b/cpp/test/uwp/msbuild/uwp.vcxproj
@@ -8,12 +8,14 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
- <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
- <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
- <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
+ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir>
+ <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps>
+ <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets>
+ <TestSuiteDir>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)../../../../).Replace('\', '/'))</TestSuiteDir>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ItemGroup Label="ProjectConfigurations">
@@ -106,31 +108,43 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..;Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalOptions>/FC %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>TESTSUITE_DIR="$(TestSuiteDir)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<AdditionalIncludeDirectories>..;Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalOptions>/FC %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>TESTSUITE_DIR="$(TestSuiteDir)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..;Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalOptions>/FC %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>TESTSUITE_DIR="$(TestSuiteDir)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..;Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalOptions>/FC %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>TESTSUITE_DIR="$(TestSuiteDir)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<AdditionalIncludeDirectories>..;Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalOptions>/FC %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>TESTSUITE_DIR="$(TestSuiteDir)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..;Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalOptions>/FC %(AdditionalOptions)</AdditionalOptions>
+ <PreprocessorDefinitions>TESTSUITE_DIR="$(TestSuiteDir)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -264,8 +278,116 @@
<None Include="..\..\..\..\certs\cacert.der">
<DeploymentContent>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>
+ <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\cacert2.pem">
+ <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\cacerts.pem">
+ <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\c_rsa_ca1.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\c_rsa_ca1_exp.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\c_rsa_ca1_exp_pub.pem">
+ <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\c_rsa_ca1_pub.pem">
+ <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\c_rsa_ca2.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\c_rsa_cai2.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\s_rsa_ca1_exp_pub.pem">
+ <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\s_rsa_ca1_pub.pem">
+ <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\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="..\TestSuite_TemporaryKey.pfx" />
- <None Include="packages.config" />
+ <None Include="packages.config">
+ <SubType>Designer</SubType>
+ </None>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Ice\acm\msbuild\uwp\client\Win32\Debug\Ice_acm_client.dll">
@@ -1359,4 +1481,10 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.props'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha3\build\native\zeroc.ice.uwp.targets'))" />
</Target>
+ <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/cpp/test/uwp/msbuild/uwp.vcxproj.filters b/cpp/test/uwp/msbuild/uwp.vcxproj.filters
index 8fe191b5f53..2180b8057fc 100644
--- a/cpp/test/uwp/msbuild/uwp.vcxproj.filters
+++ b/cpp/test/uwp/msbuild/uwp.vcxproj.filters
@@ -102,6 +102,9 @@
<Filter Include="Header Files\x64\Release">
<UniqueIdentifier>{199edc9c-ac6b-4501-b77a-ff1231d099f3}</UniqueIdentifier>
</Filter>
+ <Filter Include="certs">
+ <UniqueIdentifier>{e1bfbab3-c887-463f-88b1-ac3aed2972ff}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="..\App.xaml" />
@@ -189,7 +192,6 @@
</IceBuilder>
</ItemGroup>
<ItemGroup>
- <None Include="..\..\..\..\certs\cacert.der" />
<None Include="..\..\Ice\proxy\msbuild\uwp\client\x64\Debug\Ice_proxy_client.dll">
<Filter>Tests\x64\Debug</Filter>
</None>
@@ -1425,5 +1427,59 @@
</None>
<None Include="..\TestSuite_TemporaryKey.pfx" />
<None Include="packages.config" />
+ <None Include="..\..\IceSSL\configuration\msbuild\uwp\client\Win32\Debug\IceSSL_configuration_client.dll">
+ <Filter>Tests\Win32\Debug</Filter>
+ </None>
+ <None Include="..\..\IceSSL\configuration\msbuild\uwp\client\Win32\Release\IceSSL_configuration_client.dll">
+ <Filter>Tests\Win32\Release</Filter>
+ </None>
+ <None Include="..\..\IceSSL\configuration\msbuild\uwp\client\x64\Debug\IceSSL_configuration_client.dll">
+ <Filter>Tests\x64\Debug</Filter>
+ </None>
+ <None Include="..\..\IceSSL\configuration\msbuild\uwp\client\x64\Release\IceSSL_configuration_client.dll">
+ <Filter>Tests\x64\Release</Filter>
+ </None>
+ <None Include="..\..\IceSSL\configuration\msbuild\uwp\client\ARM\Debug\IceSSL_configuration_client.dll">
+ <Filter>Tests\ARM\Debug</Filter>
+ </None>
+ <None Include="..\..\IceSSL\configuration\msbuild\uwp\client\ARM\Release\IceSSL_configuration_client.dll">
+ <Filter>Tests\ARM\Release</Filter>
+ </None>
+ <None Include="..\..\..\..\certs\cacert.der">
+ <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\c_rsa_ca1_pub.pem">
+ <Filter>certs</Filter>
+ </None>
+ <None Include="..\..\IceSSL\certs\s_rsa_ca1_pub.pem">
+ <Filter>certs</Filter>
+ </None>
+ <None Include="..\..\IceSSL\certs\c_rsa_ca1.p12">
+ <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_ca1_exp.p12">
+ <Filter>certs</Filter>
+ </None>
+ <None Include="..\..\IceSSL\certs\s_rsa_ca1_exp_pub.pem">
+ <Filter>certs</Filter>
+ </None>
+ <None Include="..\..\IceSSL\certs\c_rsa_ca1_exp_pub.pem">
+ <Filter>certs</Filter>
+ </None>
+ <None Include="..\..\IceSSL\certs\cacerts.pem">
+ <Filter>certs</Filter>
+ </None>
</ItemGroup>
</Project> \ No newline at end of file