Remove IcePatch2 (#602)

Removed IcePatch2 and the corresponding distrib and patching features in IceGrid and IceGridGUI.

21 files changed, 0 insertions, 1585 deletions

diff --git a/cpp/test/IceGrid/admin/test.py b/cpp/test/IceGrid/admin/test.py
index 593b2a8e934..5e96d6787d3 100644
--- a/cpp/test/IceGrid/admin/test.py
+++ b/cpp/test/IceGrid/admin/test.py
@@ -78,8 +78,6 @@ class IceGridAdminTestCase(IceGridTestCase):
             expect(admin, '>>> ')
             admin.sendline(current, 'application update application.xml server.dir=%s' % serverDir)
             expect(admin, '>>> ')
-            admin.sendline(current, 'application patch Test')
-            expect(admin, '>>> ')
             admin.sendline(current, 'server list')
             expect(admin, 'server')
             expect(admin, '>>> ')
@@ -99,8 +97,6 @@ class IceGridAdminTestCase(IceGridTestCase):
             admin.sendline(current, 'server property server Ice.Admin.ServerId')
             expect(admin, "^server")
             expect(admin, '>>> ')
-            admin.sendline(current, 'server patch server')
-            expect(admin, '>>> ')
             admin.sendline(current, 'server disable server')
             expect(admin, '>>> ')
             admin.sendline(current, 'server enable server')
diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp
index b4ba1780519..31123448eaf 100644
--- a/cpp/test/IceGrid/deployer/AllTests.cpp
+++ b/cpp/test/IceGrid/deployer/AllTests.cpp
@@ -711,7 +711,6 @@ allTests(Test::TestHelper* helper)
     ServerDescriptorPtr server = ServerDescriptorPtr::dynamicCast(templ.descriptor);
     server->id = "test";
     server->exe = "${test.dir}/server";
-    server->applicationDistrib = false;
     server->allocatable = false;
     ApplicationDescriptor desc;
     desc.name = "App";
diff --git a/cpp/test/IceGrid/distribution/AllTests.cpp b/cpp/test/IceGrid/distribution/AllTests.cpp
deleted file mode 100644
index 7aede6e5ba2..00000000000
--- a/cpp/test/IceGrid/distribution/AllTests.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceUtil/Thread.h>
-#include <Ice/Ice.h>
-#include <IceGrid/IceGrid.h>
-#include <TestHelper.h>
-#include <Test.h>
-
-#include <iterator>
-
-using namespace std;
-using namespace Test;
-using namespace IceGrid;
-
-void
-allTests(Test::TestHelper* helper)
-{
-    Ice::CommunicatorPtr communicator = helper->communicator();
-    IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
-        communicator->stringToProxy(communicator->getDefaultLocator()->ice_getIdentity().category + "/Registry"));
-    test(registry);
-    AdminSessionPrx session = registry->createAdminSession("foo", "bar");
-
-    session->ice_getConnection()->setACM(registry->getACMTimeout(),
-                                         IceUtil::None,
-                                         Ice::ICE_ENUM(ACMHeartbeat, HeartbeatAlways));
-
-    AdminPrx admin = session->getAdmin();
-    test(admin);
-
-    cout << "testing distributions... " << flush;
-    {
-        admin->startServer("Test.IcePatch2");
-        admin->startServer("IcePatch2-Direct");
-
-        TestIntfPrx test;
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-all"));
-        test(test->getServerFile("rootfile") == "");
-
-        try
-        {
-            admin->patchServer("server-all", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        test(test->getServerFile("rootfile") == "rootfile");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "dummy-file3");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-all-direct"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "");
-        test(test->getServerFile("dir1/file2") == "");
-        test(test->getServerFile("dir2/file3") == "");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-
-        try
-        {
-            admin->patchServer("server-all-direct", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        test(test->getServerFile("rootfile") == "rootfile");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "dummy-file3");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-
-        try
-        {
-            admin->patchApplication("Test", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-dir1"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-
-        admin->stopServer("Test.IcePatch2");
-        admin->stopServer("IcePatch2-Direct");
-    }
-    cout << "ok" << endl;
-
-    cout << "testing distributions after update... " << flush;
-    {
-        ApplicationUpdateDescriptor update;
-        update.name = "Test";
-        update.variables["icepatch.directory"] = "${test.dir}/data/updated";
-        admin->updateApplication(update);
-
-        admin->startServer("Test.IcePatch2");
-        admin->startServer("IcePatch2-Direct");
-
-        TestIntfPrx test;
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-all"));
-        test(test->getServerFile("rootfile") == "rootfile");
-
-        try
-        {
-            admin->patchServer("server-all", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        test(test->getServerFile("rootfile") == "rootfile-updated!");
-        test(test->getServerFile("dir1/file1") == "");
-        test(test->getServerFile("dir1/file2") == "dummy-file2-updated!");
-        test(test->getServerFile("dir2/file3") == "dummy-file3");
-        test(test->getServerFile("dir2/file4") == "dummy-file4");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-        test(test->getApplicationFile("dir2/file4") == "dummy-file4");
-
-        try
-        {
-            admin->patchServer("server-all-direct", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-all-direct"));
-
-        test(test->getServerFile("rootfile") == "rootfile-updated!");
-        test(test->getServerFile("dir1/file1") == "");
-        test(test->getServerFile("dir1/file2") == "dummy-file2-updated!");
-        test(test->getServerFile("dir2/file3") == "dummy-file3");
-        test(test->getServerFile("dir2/file4") == "dummy-file4");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-        test(test->getApplicationFile("dir2/file4") == "dummy-file4");
-
-        try
-        {
-            admin->patchApplication("Test", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-dir1"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "");
-        test(test->getServerFile("dir1/file2") == "dummy-file2-updated!");
-        test(test->getServerFile("dir2/file3") == "");
-        test(test->getServerFile("dir2/file4") == "");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-        test(test->getApplicationFile("dir2/file4") == "dummy-file4");
-
-        admin->stopServer("Test.IcePatch2");
-        admin->stopServer("IcePatch2-Direct");
-    }
-    cout << "ok" << endl;
-
-    cout << "testing application distrib configuration... " << flush;
-    try
-    {
-        ApplicationDescriptor app = admin->getApplicationInfo("Test").descriptor;
-        admin->removeApplication("Test");
-
-        app.variables["icepatch.directory"] = "${test.dir}/data/original";
-        test(app.nodes["localnode"].servers[2]->id == "server-dir1");
-        app.nodes["localnode"].servers[2]->applicationDistrib = false;
-
-        admin->addApplication(app);
-        admin->startServer("Test.IcePatch2");
-
-        try
-        {
-            admin->patchServer("server-dir1", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        TestIntfPrx test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-dir1"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "");
-
-        admin->removeApplication("Test");
-
-        admin->addApplication(app);
-        admin->startServer("Test.IcePatch2");
-        admin->startServer("IcePatch2-Direct");
-
-        try
-        {
-            admin->patchApplication("Test", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-dir1"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "dummy-file3");
-
-        admin->removeApplication("Test");
-
-        app.distrib.icepatch = "";
-
-        admin->addApplication(app);
-        admin->startServer("Test.IcePatch2");
-        admin->startServer("IcePatch2-Direct");
-
-        try
-        {
-            admin->patchServer("server-dir1", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-dir1"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "");
-
-        test(test->getApplicationFile("rootfile") == "");
-        test(test->getApplicationFile("dir1/file1") == "");
-        test(test->getApplicationFile("dir1/file2") == "");
-        test(test->getApplicationFile("dir2/file3") == "");
-
-        test = TestIntfPrx::uncheckedCast(communicator->stringToProxy("server-all"));
-
-        test(test->getServerFile("rootfile") == "");
-        test(test->getServerFile("dir1/file1") == "");
-        test(test->getServerFile("dir1/file2") == "");
-        test(test->getServerFile("dir2/file3") == "");
-
-        try
-        {
-            admin->patchApplication("Test", true);
-        }
-        catch(const PatchException& ex)
-        {
-            copy(ex.reasons.begin(), ex.reasons.end(), ostream_iterator<string>(cerr, "\n"));
-            test(false);
-        }
-
-        test(test->getServerFile("rootfile") == "rootfile");
-        test(test->getServerFile("dir1/file1") == "dummy-file1");
-        test(test->getServerFile("dir1/file2") == "dummy-file2");
-        test(test->getServerFile("dir2/file3") == "dummy-file3");
-    }
-    catch(const DeploymentException& ex)
-    {
-        cerr << ex << ":\n" << ex.reason << endl;
-        test(false);
-    }
-    cout << "ok" << endl;
-
-    session->destroy();
-}
diff --git a/cpp/test/IceGrid/distribution/Client.cpp b/cpp/test/IceGrid/distribution/Client.cpp
deleted file mode 100644
index 0d88f5c27be..00000000000
--- a/cpp/test/IceGrid/distribution/Client.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/Ice.h>
-#include <TestHelper.h>
-#include <Test.h>
-
-using namespace std;
-
-class Client : public Test::TestHelper
-{
-public:
-
-    void run(int, char**);
-};
-
-void
-Client::run(int argc, char** argv)
-{
-    Ice::CommunicatorHolder communicator = initialize(argc, argv);
-    communicator->getProperties()->parseCommandLineOptions("", Ice::argsToStringSeq(argc, argv));
-    void allTests(Test::TestHelper*);
-    allTests(this);
-}
-
-DEFINE_TEST(Client)
diff --git a/cpp/test/IceGrid/distribution/Makefile.mk b/cpp/test/IceGrid/distribution/Makefile.mk
deleted file mode 100644
index 351ed573e7e..00000000000
--- a/cpp/test/IceGrid/distribution/Makefile.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-
-$(test)_client_dependencies = IceGrid Glacier2
-
-tests += $(test)
diff --git a/cpp/test/IceGrid/distribution/Server.cpp b/cpp/test/IceGrid/distribution/Server.cpp
deleted file mode 100644
index b1335eb7399..00000000000
--- a/cpp/test/IceGrid/distribution/Server.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/Ice.h>
-#include <TestI.h>
-#include <TestHelper.h>
-
-using namespace std;
-
-class Server : public Test::TestHelper
-{
-public:
-
-    void run(int, char**);
-};
-
-void
-Server::run(int argc, char** argv)
-{
-    Ice::CommunicatorHolder communicator = initialize(argc, argv);
-    Ice::PropertiesPtr properties = communicator->getProperties();
-    string name = properties->getProperty("Ice.ProgramName");
-    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Server");
-    Ice::ObjectPtr object = new TestI(properties);
-    adapter->add(object, Ice::stringToIdentity(name));
-
-    try
-    {
-        adapter->activate();
-    }
-    catch(const Ice::ObjectAdapterDeactivatedException&)
-    {
-    }
-    communicator->waitForShutdown();
-}
-
-DEFINE_TEST(Server)
diff --git a/cpp/test/IceGrid/distribution/Test.ice b/cpp/test/IceGrid/distribution/Test.ice
deleted file mode 100644
index 51ea654edc3..00000000000
--- a/cpp/test/IceGrid/distribution/Test.ice
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#pragma once
-
-module Test
-{
-
-interface TestIntf
-{
-    string getServerFile(string path);
-    string getApplicationFile(string path);
-}
-
-}
diff --git a/cpp/test/IceGrid/distribution/TestI.cpp b/cpp/test/IceGrid/distribution/TestI.cpp
deleted file mode 100644
index bd591ac5046..00000000000
--- a/cpp/test/IceGrid/distribution/TestI.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/Ice.h>
-#include <TestI.h>
-
-#include <fstream>
-
-using namespace std;
-
-TestI::TestI(const Ice::PropertiesPtr& properties) :
-    _properties(properties)
-{
-}
-
-string
-TestI::getServerFile(const string& path, const Ice::Current&)
-{
-    string file = _properties->getProperty("ServerDistrib") + "/" + path;
-    ifstream is(file.c_str());
-    string content;
-    if(is.good())
-    {
-        is >> content;
-    }
-    return content;
-}
-
-string
-TestI::getApplicationFile(const string& path, const Ice::Current&)
-{
-    string file = _properties->getProperty("ApplicationDistrib") + "/" + path;
-    ifstream is(file.c_str());
-    string content;
-    if(is.good())
-    {
-        is >> content;
-    }
-    return content;
-}
diff --git a/cpp/test/IceGrid/distribution/TestI.h b/cpp/test/IceGrid/distribution/TestI.h
deleted file mode 100644
index 2eedcb913b5..00000000000
--- a/cpp/test/IceGrid/distribution/TestI.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef TEST_I_H
-#define TEST_I_H
-
-#include <Test.h>
-
-class TestI : public ::Test::TestIntf
-{
-public:
-
-    TestI(const Ice::PropertiesPtr&);
-
-    virtual std::string getServerFile(const std::string&, const Ice::Current&);
-    virtual std::string getApplicationFile(const std::string&, const Ice::Current&);
-
-private:
-
-    Ice::PropertiesPtr _properties;
-};
-
-#endif
diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml
deleted file mode 100644
index 3424f98b642..00000000000
--- a/cpp/test/IceGrid/distribution/application.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<icegrid>
-
-  <application name="Test">
-    <variable name="icepatch.directory" value="${test.dir}/data/original"/>
-
-    <server-template id="IcePatch2">
-
-       <parameter name="instance-name" default="${application}.IcePatch2"/>
-       <parameter name="endpoints" default="default"/>
-       <parameter name="directory"/>
-
-       <server id="${instance-name}"
-               exe="${icepatch2server.exe}"
-               application-distrib="false" activation="manual">
-         <adapter name="IcePatch2" endpoints="${endpoints}">
-           <object identity="${instance-name}/server" type="::IcePatch2::FileServer"/>
-         </adapter>
-         <properties>
-            <property name="IcePatch2.InstanceName" value="${instance-name}"/>
-            <property name="IcePatch2.Directory" value="${directory}"/>
-         </properties>
-       </server>
-
-    </server-template>
-
-    <distrib>
-      <directory>dir2</directory>
-    </distrib>
-
-    <node name="localnode">
-
-      <server-instance template="IcePatch2" directory="${icepatch.directory}"/>
-      <server-instance template="IcePatch2"
-                       directory="${icepatch.directory}"
-                       instance-name="IcePatch2-Direct"
-                       endpoints="default -p 12001"/>
-
-      <server id="server-all" exe="${server.dir}/server" activation="on-demand">
-        <adapter name="Server" endpoints="default">
-          <object identity="${server}"/>
-        </adapter>
-        <distrib/>
-        <properties>
-          <property name="ApplicationDistrib" value="${application.distrib}"/>
-          <property name="ServerDistrib" value="${server.distrib}"/>
-        </properties>
-      </server>
-
-      <server id="server-all-direct" exe="${server.dir}/server" activation="on-demand">
-        <adapter name="Server" endpoints="default">
-          <object identity="${server}"/>
-        </adapter>
-        <distrib icepatch="IcePatch2-Direct/server:default -p 12001"/>
-        <properties>
-          <property name="ApplicationDistrib" value="${application.distrib}"/>
-          <property name="ServerDistrib" value="${server.distrib}"/>
-        </properties>
-      </server>
-
-      <server id="server-dir1" exe="${server.dir}/server" activation="on-demand">
-        <adapter name="Server" endpoints="default">
-          <object identity="${server}"/>
-        </adapter>
-        <distrib>
-          <directory>dir1</directory>
-        </distrib>
-        <properties>
-          <property name="ApplicationDistrib" value="${application.distrib}"/>
-          <property name="ServerDistrib" value="${server.distrib}"/>
-        </properties>
-      </server>
-
-    </node>
-  </application>
-
-</icegrid>
diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj
deleted file mode 100644
index 2db3e24dbc0..00000000000
--- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Cpp11-Debug|Win32">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Debug|x64">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|Win32">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|x64">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</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>{DFDF7BA0-4F61-4060-B919-7C8B2D40172E}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" />
-  </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)'=='Cpp11-Debug|Win32'" 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)'=='Cpp11-Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" 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|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Label="IceBuilder">
-    <SliceCompile />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Test.ice" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\AllTests.cpp" />
-    <ClCompile Include="..\..\Client.cpp" />
-    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <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.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters b/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters
deleted file mode 100644
index ec895771f10..00000000000
--- a/cpp/test/IceGrid/distribution/msbuild/client/client.vcxproj.filters
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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="x64\Cpp11-Debug\Test.cpp">
-      <Filter>Source Files\x64\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
-      <Filter>Source Files\Win32\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Test.cpp">
-      <Filter>Source Files\x64\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Test.cpp">
-      <Filter>Source Files\Win32\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Test.cpp">
-      <Filter>Source Files\x64\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Test.cpp">
-      <Filter>Source Files\Win32\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
-      <Filter>Source Files\x64\Cpp11-Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
-      <Filter>Source Files\Win32\Cpp11-Release</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{6e16cb97-1652-4903-b3d0-5d8ae995bf72}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Slice Files">
-      <UniqueIdentifier>{d9d11d9a-6df7-49ae-9243-da834907fadb}</UniqueIdentifier>
-      <Extensions>ice</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{cba3fb94-85cd-4320-a022-79e03dc78eed}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64">
-      <UniqueIdentifier>{b0c6d481-e295-412d-ab5d-e77d4e0239c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{7a939a79-7044-4da3-8089-6ad014d7df11}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64">
-      <UniqueIdentifier>{7afc95df-a2cf-4992-a2e8-e574e678dd00}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{7369b844-8333-4dd4-be5b-54b392c95804}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32">
-      <UniqueIdentifier>{3db9237f-43da-4e7b-91e6-fca122d2eaa8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{4b088de8-7c80-46ae-8caf-90833c5c194b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32">
-      <UniqueIdentifier>{f005857f-8f03-4ede-bc86-1cfcc98acbce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{a107f57a-91e8-48b6-bb10-520074ae2a47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Debug">
-      <UniqueIdentifier>{2216c67b-27c6-4c7e-8bc0-51f6cdc9b1c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Debug">
-      <UniqueIdentifier>{6d280dea-88db-498e-9006-1c6984230743}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Debug">
-      <UniqueIdentifier>{7511c258-4199-4a69-9adb-37011a9f03da}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Debug">
-      <UniqueIdentifier>{4539c5c5-e592-41bc-9212-227408721de4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Release">
-      <UniqueIdentifier>{29578af8-cf93-45cc-b4b3-b3aa31ce3ae1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Release">
-      <UniqueIdentifier>{a0a8ee67-36c6-498b-a67e-84e2755305df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Release">
-      <UniqueIdentifier>{98ac640a-57fd-4ca2-a17b-1e5ef9cca9b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Release">
-      <UniqueIdentifier>{f02d91fc-59bb-452d-87e9-b6f20ac64a84}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{47c8bdf0-aa47-4350-b24f-b75bd43e84e8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{b7f04836-f33d-4085-84cf-10a6728c80fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{b685497f-5dda-4866-abab-aa1e913ae9bb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{4a079582-c420-41d5-86ab-cf35fef86293}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="x64\Cpp11-Debug\Test.h">
-      <Filter>Header Files\x64\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
-      <Filter>Header Files\Win32\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Test.h">
-      <Filter>Header Files\x64\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Test.h">
-      <Filter>Header Files\Win32\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Test.h">
-      <Filter>Header Files\x64\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Test.h">
-      <Filter>Header Files\Win32\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Test.h">
-      <Filter>Header Files\x64\Cpp11-Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Test.h">
-      <Filter>Header Files\Win32\Cpp11-Release</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Test.ice">
-      <Filter>Slice Files</Filter>
-    </SliceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/cpp/test/IceGrid/distribution/msbuild/client/packages.config b/cpp/test/IceGrid/distribution/msbuild/client/packages.config
deleted file mode 100644
index 1ab4167f703..00000000000
--- a/cpp/test/IceGrid/distribution/msbuild/client/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/cpp/test/IceGrid/distribution/msbuild/server/packages.config b/cpp/test/IceGrid/distribution/msbuild/server/packages.config
deleted file mode 100644
index 1ab4167f703..00000000000
--- a/cpp/test/IceGrid/distribution/msbuild/server/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" />
-  <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj
deleted file mode 100644
index 2411f3fd2e1..00000000000
--- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Cpp11-Debug|Win32">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Debug|x64">
-      <Configuration>Cpp11-Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|Win32">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Cpp11-Release|x64">
-      <Configuration>Cpp11-Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</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>{E4DC9D1E-8282-491F-A1FA-AF497EB1FF9C}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" />
-    <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" />
-  </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)'=='Cpp11-Debug|Win32'" 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)'=='Cpp11-Release|Win32'" 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 Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" 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|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Label="IceBuilder">
-    <SliceCompile />
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Test.ice" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Server.cpp" />
-    <ClCompile Include="..\..\TestI.cpp" />
-    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\TestI.h" />
-    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Test.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild>
-      <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)'=='Cpp11-Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild>
-      <SliceCompileSource>..\..\Test.ice</SliceCompileSource>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <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.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters b/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters
deleted file mode 100644
index 0c3c78224ef..00000000000
--- a/cpp/test/IceGrid/distribution/msbuild/server/server.vcxproj.filters
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\Server.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\TestI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Test.cpp">
-      <Filter>Source Files\x64\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Debug\Test.cpp">
-      <Filter>Source Files\Win32\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Test.cpp">
-      <Filter>Source Files\x64\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Test.cpp">
-      <Filter>Source Files\Win32\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Test.cpp">
-      <Filter>Source Files\x64\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Test.cpp">
-      <Filter>Source Files\Win32\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Test.cpp">
-      <Filter>Source Files\x64\Cpp11-Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Test.cpp">
-      <Filter>Source Files\Win32\Cpp11-Release</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{8098d582-8e25-4c1e-9501-a5bb3d3278b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{b0604b47-7033-4e8e-97e6-7e4849b391cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Slice Files">
-      <UniqueIdentifier>{db2c21e8-2cba-461b-880b-d2958e44683d}</UniqueIdentifier>
-      <Extensions>ice</Extensions>
-    </Filter>
-    <Filter Include="Source Files\x64">
-      <UniqueIdentifier>{3074b3c3-68b0-4699-a0a6-32fd96ed05ca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{a378b026-caac-43eb-bc33-c695163b0ee9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64">
-      <UniqueIdentifier>{1d935fd7-2e87-45a9-a220-b96134b7dc40}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{e7e260d3-cca1-436f-b143-1a6410c6cd7a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32">
-      <UniqueIdentifier>{95c0c4f1-5e9c-4cdb-b788-df86e237c3c4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{0b2d273a-0d81-4b7b-9e58-69605f2d4bb4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32">
-      <UniqueIdentifier>{4fcc6ea4-70f2-4ea6-863e-f0776b02741a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{d17a27cf-a349-4e0c-9f5c-1e1949514498}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Debug">
-      <UniqueIdentifier>{f85eab1b-13d6-4678-8121-67b982793dce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Debug">
-      <UniqueIdentifier>{918048bf-3624-49e7-99b7-442168757d9c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Debug">
-      <UniqueIdentifier>{29110458-ba5e-4956-b3f6-ce29065704c6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Debug">
-      <UniqueIdentifier>{b204c759-f009-4dd3-a49e-5063756f738c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Release">
-      <UniqueIdentifier>{dcc9ca45-326e-4514-8433-da2da6dafe5c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Release">
-      <UniqueIdentifier>{fd105938-b254-4b52-8566-48cb79ca2b03}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Release">
-      <UniqueIdentifier>{1ae2fa45-d2c3-4302-80f2-48f3d44f5683}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Release">
-      <UniqueIdentifier>{4fccb7ad-b255-4d93-9473-5cedbaa238d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{39771b60-5385-42a0-83e1-624286f8e1ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{85af3060-7792-4818-8d65-b4f973a2bbf8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{da3beafe-1a9f-4667-858a-9189d3010132}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{99b19e01-6c5a-41cc-ab29-2e28bd751b22}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\TestI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Debug\Test.h">
-      <Filter>Header Files\x64\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Debug\Test.h">
-      <Filter>Header Files\Win32\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Test.h">
-      <Filter>Header Files\x64\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Test.h">
-      <Filter>Header Files\Win32\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Test.h">
-      <Filter>Header Files\x64\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Test.h">
-      <Filter>Header Files\Win32\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Test.h">
-      <Filter>Header Files\x64\Cpp11-Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Test.h">
-      <Filter>Header Files\Win32\Cpp11-Release</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Test.ice">
-      <Filter>Slice Files</Filter>
-    </SliceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/cpp/test/IceGrid/distribution/test.py b/cpp/test/IceGrid/distribution/test.py
deleted file mode 100644
index 80130d90a25..00000000000
--- a/cpp/test/IceGrid/distribution/test.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-
-class IceGridDistributionTestCase(IceGridTestCase):
-
-    def setupClientSide(self, current):
-        IceGridTestCase.setupClientSide(self, current)
-
-        datadir = os.path.join(current.testsuite.getPath(), "data")
-
-        files = [
-          [ "original/rootfile", "rootfile" ],
-          [ "original/dir1/file1", "dummy-file1"],
-          [ "original/dir1/file2", "dummy-file2"],
-          [ "original/dir2/file3", "dummy-file3"],
-          [ "updated/rootfile", "rootfile-updated!" ],
-          [ "updated/dir1/file2", "dummy-file2-updated!"],
-          [ "updated/dir2/file3", "dummy-file3"],
-          [ "updated/dir2/file4", "dummy-file4"],
-        ]
-
-        current.write("creating IcePatch2 data directory... ")
-        current.mkdirs(datadir)
-
-        for [file, content] in files:
-            file = os.path.join(datadir, file)
-            if not os.path.exists(os.path.dirname(file)):
-                os.makedirs(os.path.dirname(file))
-            f = open(file, 'w')
-            f.write(content)
-            f.close()
-
-        IcePatch2Calc(args=[os.path.join(datadir, "original")]).run(current)
-        IcePatch2Calc(args=[os.path.join(datadir, "updated")]).run(current)
-
-        current.writeln("ok")
-
-if isinstance(platform, Windows) or os.getuid() != 0:
-    TestSuite(__file__, [ IceGridDistributionTestCase() ], runOnMainThread=True, multihost=False)
diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
index c2833be8d75..101e9dc6b27 100644
--- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
@@ -180,7 +180,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server";
         server->exe = properties->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         server->activation = "on-demand";
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
@@ -227,7 +226,6 @@ allTests(Test::TestHelper* helper)
         server->id = "${name}";
         server->exe = "${server.dir}/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         server->activation = "on-demand";
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
@@ -544,7 +542,6 @@ allTests(Test::TestHelper* helper)
         icebox->id = "IceBox";
         icebox->exe = properties->getProperty("IceBoxExe");
         icebox->activation = "on-demand";
-        icebox->applicationDistrib = false;
         icebox->allocatable = false;
         addProperty(icebox, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         icebox->services.resize(3);
diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp
index 96ecf08aa20..48617b06114 100644
--- a/cpp/test/IceGrid/replication/AllTests.cpp
+++ b/cpp/test/IceGrid/replication/AllTests.cpp
@@ -957,7 +957,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server";
         server->exe = comm->getProperties()->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         server->activation = "on-demand";
@@ -1193,7 +1192,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server";
         server->exe = comm->getProperties()->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         server->activation = "on-demand";
@@ -1333,7 +1331,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server";
         server->exe = comm->getProperties()->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         server->activation = "on-demand";
@@ -1389,7 +1386,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server1";
         server->exe = comm->getProperties()->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         server->activation = "on-demand";
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index de1ba3c2267..53de990eaa9 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -1808,7 +1808,6 @@ allTests(Test::TestHelper* helper)
         server->exe = properties->getProperty("IceGridNodeExe");
         server->options.push_back("--nowarn");
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "IceGrid.Node.Name", "node-1");
         addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-1");
@@ -1860,7 +1859,6 @@ allTests(Test::TestHelper* helper)
         server->exe = properties->getProperty("ServerDir") + "/server";
         server->pwd = properties->getProperty("TestDir");
 
-        server->applicationDistrib = false;
         server->allocatable = false;
         AdapterDescriptor adapter;
         adapter.name = "Server";
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index 9b4b5ce1eea..9896684cc3f 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -94,7 +94,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server";
         server->exe = properties->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         AdapterDescriptor adapter;
@@ -161,7 +160,6 @@ allTests(Test::TestHelper* helper)
         server->id = "${name}";
         server->exe = "${test.dir}/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         adapter = AdapterDescriptor();
@@ -552,7 +550,6 @@ allTests(Test::TestHelper* helper)
         server->id = "IceBox";
         server->exe = properties->getProperty("IceBoxExe");
 
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         server->services.resize(3);
@@ -718,7 +715,6 @@ allTests(Test::TestHelper* helper)
         server->id = "${name}";
         server->exe = "server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
 
         addProperty(server, "ApplicationVar", "${appvar}");
@@ -893,7 +889,6 @@ allTests(Test::TestHelper* helper)
         server->id = "${name}";
         server->exe = "server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         server->propertySet.references.push_back("ApplicationPropertySet");
         server->propertySet.references.push_back("NodePropertySet");
@@ -1099,7 +1094,6 @@ allTests(Test::TestHelper* helper)
         server->id = "node-${index}";
         server->exe = properties->getProperty("IceGridNodeExe");
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         server->options.push_back("--nowarn");
 
@@ -1162,7 +1156,6 @@ allTests(Test::TestHelper* helper)
         server->id = "Server";
         server->exe = properties->getProperty("ServerDir") + "/server";
         server->pwd = ".";
-        server->applicationDistrib = false;
         server->allocatable = false;
         addProperty(server, "Ice.Admin.Endpoints", "tcp -h 127.0.0.1");
         AdapterDescriptor adapter;