Remove Ice::Application & Glacier2::Application deprecated classes

21 files changed, 18 insertions, 2326 deletions

diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index c6e10e1ac44..0590f66c0e9 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -11,9 +11,6 @@
 #include <Glacier2/Session.h>
 #include <Glacier2/PermissionsVerifier.h>
 #include <Glacier2/Metrics.h>
-#if (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) && !defined(ICE_OS_UWP)
-#   include <Glacier2/Application.h>
-#endif
 #include <Glacier2/SessionHelper.h>
 #include <IceUtil/PopDisableWarnings.h>
 
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
deleted file mode 100644
index 973b8728413..00000000000
--- a/cpp/include/Ice/Application.h
+++ /dev/null
@@ -1,326 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_APPLICATION_H
-#define ICE_APPLICATION_H
-
-#include <Ice/Initialize.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/Cond.h>
-#include <IceUtil/CtrlCHandler.h>
-
-namespace Ice
-{
-
-using IceUtil::CtrlCHandler;
-using IceUtil::CtrlCHandlerCallback;
-
-#ifdef ICE_CPP11_MAPPING
-/**
- * Determines how the Application class handles signals.
- */
-enum class SignalPolicy : unsigned char
-#else
-enum SignalPolicy
-#endif
-{
-    /** Enables signal handling. */
-    HandleSignals,
-    /** Disables signal handling, meaning signals retain their default behavior. */
-    NoSignalHandling
-};
-
-/**
- * Singleton helper class that simplifies Ice initialization, finalization and signal handling.
- * An application uses this class by writing a subclass and implementing the run method.
- * \headerfile Ice/Ice.h
- */
-class ICE_API Application
-{
-public:
-
-    /**
-     * The constructor configures the signal handling behavior.
-     * @param policy Specifies whether to handle signals. If not specified, the default behavior
-     * is to handle signals.
-     */
-    Application(SignalPolicy policy = ICE_ENUM(SignalPolicy, HandleSignals));
-
-#ifdef ICE_CPP11_MAPPING
-    /// \cond IGNORE
-    Application(const Application&) = delete;
-    Application& operator=(const Application&) = delete;
-    /// \endcond
-#endif
-
-    virtual ~Application();
-
-    /**
-     * Call this main() from the global main(). main()
-     * initializes the Communicator, calls run() and destroys the
-     * the Communicator upon return from run(). It handles all
-     * exceptions properly, i.e., error message are printed if
-     * exceptions propagate to main(), and the Communicator is always
-     * destroyed, regardless of exceptions.
-     * @param argc Specifies the number of arguments in argv.
-     * @param argv The command-line arguments.
-     * @param initData Configuration data for the new Communicator.
-     * @param version Indicates the Ice version with which the application is compatible. If not
-     * specified, the version of the Ice installation is used.
-     * @return The application's exit status.
-     */
-    int main(int argc, const char* const argv[], const InitializationData& initData = InitializationData(),
-             int version = ICE_INT_VERSION);
-
-    /**
-     * Call this main() from the global main(). main()
-     * initializes the Communicator, calls run() and destroys the
-     * the Communicator upon return from run(). It handles all
-     * exceptions properly, i.e., error message are printed if
-     * exceptions propagate to main(), and the Communicator is always
-     * destroyed, regardless of exceptions.
-     * @param argc Specifies the number of arguments in argv.
-     * @param argv The command-line arguments.
-     * @param configFile The name of an Ice configuration file.
-     * @param version Indicates the Ice version with which the application is compatible. If not
-     * specified, the version of the Ice installation is used.
-     * @return The application's exit status.
-     */
-    int main(int argc, const char* const argv[], ICE_CONFIG_FILE_STRING configFile, int version = ICE_INT_VERSION);
-
-#ifdef _WIN32
-    /**
-     * Call this main() from the global main(). main()
-     * initializes the Communicator, calls run() and destroys the
-     * the Communicator upon return from run(). It handles all
-     * exceptions properly, i.e., error message are printed if
-     * exceptions propagate to main(), and the Communicator is always
-     * destroyed, regardless of exceptions.
-     * @param argc Specifies the number of arguments in argv.
-     * @param argv The command-line arguments.
-     * @param initData Configuration data for the new Communicator.
-     * @param version Indicates the Ice version with which the application is compatible. If not
-     * specified, the version of the Ice installation is used.
-     * @return The application's exit status.
-     */
-    int main(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData(),
-             int version = ICE_INT_VERSION);
-
-    /**
-     * Call this main() from the global main(). main()
-     * initializes the Communicator, calls run() and destroys the
-     * the Communicator upon return from run(). It handles all
-     * exceptions properly, i.e., error message are printed if
-     * exceptions propagate to main(), and the Communicator is always
-     * destroyed, regardless of exceptions.
-     * @param argc Specifies the number of arguments in argv.
-     * @param argv The command-line arguments.
-     * @param configFile The name of an Ice configuration file.
-     * @param version Indicates the Ice version with which the application is compatible. If not
-     * specified, the version of the Ice installation is used.
-     * @return The application's exit status.
-     */
-    int main(int argc, const wchar_t* const argv[], ICE_CONFIG_FILE_STRING configFile, int version = ICE_INT_VERSION);
-#endif
-
-    /**
-     * Call this main() from the global main(). main()
-     * initializes the Communicator, calls run() and destroys the
-     * the Communicator upon return from run(). It handles all
-     * exceptions properly, i.e., error message are printed if
-     * exceptions propagate to main(), and the Communicator is always
-     * destroyed, regardless of exceptions.
-     * @param args The command-line arguments.
-     * @param initData Configuration data for the new Communicator.
-     * @param version Indicates the Ice version with which the application is compatible. If not
-     * specified, the version of the Ice installation is used.
-     * @return The application's exit status.
-     */
-    int main(const StringSeq& args, const InitializationData& initData = InitializationData(),
-             int version = ICE_INT_VERSION);
-
-    /**
-     * Call this main() from the global main(). main()
-     * initializes the Communicator, calls run() and destroys the
-     * the Communicator upon return from run(). It handles all
-     * exceptions properly, i.e., error message are printed if
-     * exceptions propagate to main(), and the Communicator is always
-     * destroyed, regardless of exceptions.
-     * @param args The command-line arguments.
-     * @param configFile The name of an Ice configuration file.
-     * @param version Indicates the Ice version with which the application is compatible. If not
-     * specified, the version of the Ice installation is used.
-     * @return The application's exit status.
-     */
-    int main(const StringSeq& args, ICE_CONFIG_FILE_STRING configFile, int version = ICE_INT_VERSION);
-
-    /**
-     * run is given a copy of the remaining argc/argv arguments,
-     * after the communicator initialization in the caller (main)
-     * has removed all Ice-related arguments.
-     * @param argc Specifies the number of arguments in argv.
-     * @param argv The command-line arguments.
-     * @return The application's exit status.
-     */
-    virtual int run(int argc, char* argv[]) = 0;
-
-    /**
-     * Override this method to provide a custom application interrupt
-     * hook. You must call callbackOnInterrupt for this method to
-     * be called. Note that the interruptCallback can be called
-     * concurrently with any other thread (including main) in your
-     * application and thus must take appropriate concurrency
-     * precautions.
-     * @param signal The signal identifier.
-     */
-    virtual void interruptCallback(int signal);
-
-    /**
-     * Obtains the application name, i.e., argv[0].
-     * @return The application's name.
-     */
-    static const char* appName();
-
-    /**
-     * Obtains the application's Communicator instance.
-     * One limitation of this class is that there can only be one
-     * Application instance, with one global Communicator, accessible
-     * with this communicator() operation. This limitation is due to
-     * how the signal handling functions below operate. If you require
-     * multiple Communicators, then you cannot use this Application
-     * framework class.
-     * @return The application's communicator.
-     */
-    static CommunicatorPtr communicator();
-
-    /**
-     * Configures the application to destroy the communicator when one of the
-     * monitored signals is raised. This is the default behavior.
-     */
-    static void destroyOnInterrupt();
-
-    /**
-     * Configures the application to shut down the communicator when one of the
-     * monitored signals is raised.
-     */
-    static void shutdownOnInterrupt();
-
-    /**
-     * Configures the application to ignore signals.
-     */
-    static void ignoreInterrupt();
-
-    /**
-     * Configures the application to invoke interruptCallback when a signal occurs,
-     * thereby giving the subclass responsibility for handling the signal.
-     */
-    static void callbackOnInterrupt();
-
-    /**
-     * Configures the application to ignore (but remember) a signal.
-     * A stored signal (if any) can be handled later by calling releaseInterrupt.
-     */
-    static void holdInterrupt();
-
-    /**
-     * Processes a stored signal (if any) using the current signal handling configuration.
-     */
-    static void releaseInterrupt();
-
-    /**
-     * Indicates whether a signal handler was triggered.
-     * This can be used once Communicator::waitForShutdown() returns to
-     * test whether the shutdown was due to an interrupt (returns true)
-     * or because Communicator::shutdown() was called (returns false).
-     * @return True if a signal handler was triggered, false otherwise.
-     */
-    static bool interrupted();
-
-protected:
-
-    /**
-     * Helper function that implements the application logic.
-     */
-    virtual int doMain(int, char*[], const InitializationData&, Int);
-
-    /**
-     * Used to synchronize the main thread and the CtrlCHandler thread.
-     */
-    static IceUtil::Mutex _mutex;
-
-    /**
-     * Used to synchronize the main thread and the CtrlCHandler thread.
-     */
-    static IceUtil::Cond _condVar;
-
-    /**
-     * True if a signal handling callback is currently executing.
-     * Can change while run() and communicator->destroy() are running!
-     */
-    static bool _callbackInProgress;
-
-    /**
-     * True if the communicator has been destroyed.
-     * Can change while run() and communicator->destroy() are running!
-     */
-    static bool _destroyed;
-
-    /**
-     * True if an interrupt signal was received.
-     * Can change while run() and communicator->destroy() are running!
-     */
-    static bool _interrupted;
-
-    /**
-     * The application's name.
-     * Immutable during run() and until communicator->destroy() has returned.
-     * Before and after run(), and once communicator->destroy() has returned,
-     * we assume that only the main thread and CtrlCHandler threads are running.
-     */
-    static std::string _appName;
-
-    /**
-     * The application's communicator.
-     * Immutable during run() and until communicator->destroy() has returned.
-     * Before and after run(), and once communicator->destroy() has returned,
-     * we assume that only the main thread and CtrlCHandler threads are running.
-     */
-    static CommunicatorPtr _communicator;
-
-    /**
-     * The signal-handling policy specified at construction.
-     * Immutable during run() and until communicator->destroy() has returned.
-     * Before and after run(), and once communicator->destroy() has returned,
-     * we assume that only the main thread and CtrlCHandler threads are running.
-     */
-    static SignalPolicy _signalPolicy;
-
-    /**
-     * The singleton instance.
-     * Immutable during run() and until communicator->destroy() has returned.
-     * Before and after run(), and once communicator->destroy() has returned,
-     * we assume that only the main thread and CtrlCHandler threads are running.
-     */
-    static Application* _application;
-
-private:
-
-    static void holdInterruptCallback(int);
-    static void destroyOnInterruptCallback(int);
-    static void shutdownOnInterruptCallback(int);
-    static void callbackOnInterruptCallback(int);
-
-#ifndef ICE_CPP11_MAPPING
-    //
-    // Not defined, make Application non-copyable
-    //
-    Application(const Application&);
-    Application& operator=(const Application&);
-#endif
-
-};
-
-}
-
-#endif
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 692dd6ee5c9..a9e2c0c845e 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -6,6 +6,7 @@
 #define ICE_ICE_H
 
 #include <IceUtil/PushDisableWarnings.h>
+#include <IceUtil/CtrlCHandler.h>
 #include <Ice/Config.h>
 #include <Ice/Comparable.h>
 #include <Ice/Initialize.h>
@@ -27,9 +28,6 @@
 #include <Ice/OutgoingAsync.h>
 #include <Ice/IncomingAsync.h>
 #include <Ice/Process.h>
-#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
-#   include <Ice/Application.h>
-#endif
 #include <Ice/Connection.h>
 #include <Ice/ConnectionAsync.h>
 #include <Ice/Functional.h>
diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln
index 7598f84822d..cfaf61ba7c1 100644
--- a/cpp/msbuild/ice.test.sln
+++ b/cpp/msbuild/ice.test.sln
@@ -1134,18 +1134,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Slice\esc
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "application", "application", "{AF5CB568-B5E7-44F6-BEE7-0724AA8B6A36}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Glacier2\application\msbuild\client\client.vcxproj", "{24916CD9-F28F-436C-8F20-B22BE0555601}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Glacier2\application\msbuild\server\server.vcxproj", "{E17093DB-4940-4EB4-A7BB-6958A96475E2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serveramd", "..\test\Ice\impl\msbuild\serveramd\serveramd.vcxproj", "{806A4720-1E5E-4479-A92B-07D3253E72ED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
@@ -3963,38 +3951,6 @@ Global
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.Build.0 = Release|Win32
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.ActiveCfg = Release|x64
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.Build.0 = Release|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|Win32.ActiveCfg = Debug|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|Win32.Build.0 = Debug|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|x64.ActiveCfg = Debug|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Debug|x64.Build.0 = Debug|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Release|Win32.ActiveCfg = Release|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Release|Win32.Build.0 = Release|Win32
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Release|x64.ActiveCfg = Release|x64
-		{24916CD9-F28F-436C-8F20-B22BE0555601}.Release|x64.Build.0 = Release|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|Win32.Build.0 = Debug|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|x64.ActiveCfg = Debug|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Debug|x64.Build.0 = Debug|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|Win32.ActiveCfg = Release|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|Win32.Build.0 = Release|Win32
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|x64.ActiveCfg = Release|x64
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2}.Release|x64.Build.0 = Release|x64
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32
 		{806A4720-1E5E-4479-A92B-07D3253E72ED}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64
@@ -4359,9 +4315,6 @@ Global
 		{28347243-F75F-4B28-89F9-7EA84478D9C9} = {36E32583-310E-48E3-B821-CE79701BDF1D}
 		{72BF4C3D-8E1B-4875-A9AA-2FD63C2442AB} = {6329287B-7697-40B8-A45A-03405F474D72}
 		{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC} = {72BF4C3D-8E1B-4875-A9AA-2FD63C2442AB}
-		{AF5CB568-B5E7-44F6-BEE7-0724AA8B6A36} = {4CE3B59A-59E3-4182-82BE-A92BD4FC9657}
-		{24916CD9-F28F-436C-8F20-B22BE0555601} = {AF5CB568-B5E7-44F6-BEE7-0724AA8B6A36}
-		{E17093DB-4940-4EB4-A7BB-6958A96475E2} = {AF5CB568-B5E7-44F6-BEE7-0724AA8B6A36}
 		{806A4720-1E5E-4479-A92B-07D3253E72ED} = {B69BC45E-DAEC-4282-B49E-A91069D9574A}
 		{AD44358A-B409-469F-9ED3-3E3B677A2A51} = {A9044FF2-2C83-4CB3-922F-2EBC3DF78EEB}
 		{86FA255C-ED2F-44E3-989B-F9291165D3E1} = {AD44358A-B409-469F-9ED3-3E3B677A2A51}
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
index a505e8cb030..af7771ee214 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
@@ -99,7 +99,6 @@
     <SliceCompile Include="..\..\..\..\..\slice\Glacier2\SSLInfo.ice" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Application.cpp" />
     <ClCompile Include="..\..\NullPermissionsVerifier.cpp" />
     <ClCompile Include="..\..\SessionHelper.cpp" />
     <ClCompile Include="Win32\Debug\Metrics.cpp">
@@ -440,7 +439,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Glacier2\SSLInfo.ice</SliceCompileSource>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h" />
     <ClInclude Include="..\..\..\..\include\Glacier2\Config.h" />
     <ClInclude Include="..\..\..\..\include\Glacier2\Glacier2.h" />
     <ClInclude Include="..\..\..\..\include\Glacier2\NullPermissionsVerifier.h" />
@@ -464,4 +462,4 @@
     <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
+</Project>
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
index 8c8dfe3451c..b99227e6769 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
@@ -97,7 +97,6 @@
     </SliceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Application.cpp" />
     <ClCompile Include="..\..\NullPermissionsVerifier.cpp" />
     <ClCompile Include="..\..\SessionHelper.cpp" />
     <ClCompile Include="Win32\Debug\Metrics.cpp">
@@ -438,7 +437,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Glacier2\SSLInfo.ice</SliceCompileSource>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\Glacier2\Application.h" />
     <ClInclude Include="..\..\..\..\include\Glacier2\Config.h" />
     <ClInclude Include="..\..\..\..\include\Glacier2\Glacier2.h" />
     <ClInclude Include="..\..\..\..\include\Glacier2\NullPermissionsVerifier.h" />
@@ -471,4 +469,4 @@
     <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
+</Project>
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
deleted file mode 100644
index fffd70d9902..00000000000
--- a/cpp/src/Ice/Application.cpp
+++ /dev/null
@@ -1,661 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/Application.h>
-#include <Ice/LoggerI.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/ArgVector.h>
-
-#ifdef _WIN32
-const DWORD SIGHUP = CTRL_LOGOFF_EVENT;
-#else
-#   include <csignal>
-#endif
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-using namespace IceUtil;
-using namespace IceUtilInternal;
-
-//
-// static member initialization
-//
-IceUtil::Mutex Ice::Application::_mutex;
-IceUtil::Cond Ice::Application::_condVar;
-
-bool Ice::Application::_callbackInProgress = false;
-bool Ice::Application::_destroyed = false;
-bool Ice::Application::_interrupted = false;
-
-string Ice::Application::_appName;
-Ice::CommunicatorPtr Ice::Application::_communicator;
-Ice::SignalPolicy Ice::Application::_signalPolicy = ICE_ENUM(SignalPolicy, HandleSignals);
-Ice::Application* Ice::Application::_application = 0;
-
-namespace
-{
-
-//
-// Variables than can change while run() and communicator->destroy() are running!
-//
-bool _released = true;
-CtrlCHandlerCallback _previousCallback = ICE_NULLPTR;
-
-//
-// Variables that are immutable during run() and until communicator->destroy() has returned;
-// before and after run(), and once communicator->destroy() has returned, we assume that
-// only the main thread and CtrlCHandler threads are running.
-//
-CtrlCHandler* _ctrlCHandler = 0;
-bool _nohup = false;
-
-}
-
-Ice::Application::Application(SignalPolicy signalPolicy)
-{
-    Ice::Application::_signalPolicy = signalPolicy;
-}
-
-Ice::Application::~Application()
-{
-}
-
-int
-Ice::Application::main(int argc, const char* const argv[], ICE_CONFIG_FILE_STRING configFile, int version)
-{
-    _appName = "";
-    if(argc > 0)
-    {
-        _appName = argv[0];
-    }
-
-    if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
-    {
-        setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", true));
-    }
-
-    InitializationData initData;
-#ifndef ICE_CPP11_MAPPING
-    if(configFile)
-#endif
-    {
-        try
-        {
-            initData.properties = createProperties();
-            initData.properties->load(configFile);
-        }
-        catch(const Ice::Exception& ex)
-        {
-            Error out(getProcessLogger());
-            out << ex;
-            return EXIT_FAILURE;
-        }
-        catch(const std::exception& ex)
-        {
-            Error out(getProcessLogger());
-            out << ex;
-            return EXIT_FAILURE;
-        }
-        catch(...)
-        {
-            Error out(getProcessLogger());
-            out << "unknown exception";
-            return EXIT_FAILURE;
-        }
-    }
-    return main(argc, argv, initData, version);
-}
-
-#ifdef _WIN32
-int
-Ice::Application::main(int argc, const wchar_t* const argv[], const Ice::InitializationData& initData, int version)
-{
-    //
-    // On Windows the given wchar_t* strings are UTF16 and therefore
-    // needs to be converted to native narrow string encoding.
-    //
-    return main(argsToStringSeq(argc, argv), initData, version);
-}
-
-int
-Ice::Application::main(int argc, const wchar_t* const argv[], ICE_CONFIG_FILE_STRING config, int version)
-{
-    return main(argsToStringSeq(argc, argv), config, version);
-}
-#endif
-
-int
-Ice::Application::main(int argc, const char* const argv[], const InitializationData& initializationData, int version)
-{
-    if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
-    {
-        const bool convert = initializationData.properties ?
-            initializationData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
-            initializationData.properties->getProperty("Ice.StdErr").empty() : true;
-        setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", convert));
-    }
-
-    if(_communicator != 0)
-    {
-        Error out(getProcessLogger());
-        out << "only one instance of the Application class can be used";
-        return EXIT_FAILURE;
-    }
-    int status;
-
-    ArgVector av(argc, argv); // copy args
-
-    //
-    // We parse the properties here to extract Ice.ProgramName.
-    //
-    InitializationData initData = initializationData;
-    try
-    {
-        initData.properties = createProperties(av.argc, av.argv, initData.properties);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        Error out(getProcessLogger());
-        out << ex;
-        return EXIT_FAILURE;
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(getProcessLogger());
-        out << ex;
-        return EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        Error out(getProcessLogger());
-        out << "unknown exception";
-        return EXIT_FAILURE;
-    }
-    _appName = initData.properties->getPropertyWithDefault("Ice.ProgramName", _appName);
-
-    //
-    // Used by destroyOnInterruptCallback and shutdownOnInterruptCallback.
-    //
-    _nohup = initData.properties->getPropertyAsInt("Ice.Nohup") > 0;
-
-    _application = this;
-
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        try
-        {
-            //
-            // The ctrlCHandler must be created before starting any thread, in particular
-            // before initializing the communicator.
-            //
-            CtrlCHandler ctrCHandler;
-            _ctrlCHandler = &ctrCHandler;
-
-            status = doMain(av.argc, av.argv, initData, version);
-
-            //
-            // Set _ctrlCHandler to 0 only once communicator->destroy() has completed.
-            //
-            _ctrlCHandler = 0;
-        }
-        catch(const CtrlCHandlerException&)
-        {
-            Error out(getProcessLogger());
-            out << "only one instance of the CtrlCHandler class can be used";
-            status = EXIT_FAILURE;
-        }
-    }
-    else
-    {
-        status = doMain(av.argc, av.argv, initData, version);
-    }
-
-    return status;
-}
-
-int
-Ice::Application::main(const StringSeq& args, const InitializationData& initData, int version)
-{
-    ArgVector av(args);
-    return main(av.argc, av.argv, initData, version);
-}
-
-int
-Ice::Application::main(const StringSeq& args, ICE_CONFIG_FILE_STRING configFile, int version)
-{
-    ArgVector av(args);
-    return main(av.argc, av.argv, configFile, version);
-}
-
-void
-Ice::Application::interruptCallback(int)
-{
-}
-
-const char*
-Ice::Application::appName()
-{
-    return _appName.c_str();
-}
-
-CommunicatorPtr
-Ice::Application::communicator()
-{
-    return _communicator;
-}
-
-void
-Ice::Application::destroyOnInterrupt()
-{
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        if(_ctrlCHandler != 0)
-        {
-            Mutex::Lock lock(_mutex); // we serialize all the interrupt-setting
-            if(!_released)
-            {
-                _released = true;
-                _condVar.signal();
-            }
-            _ctrlCHandler->setCallback(destroyOnInterruptCallback);
-        }
-    }
-    else
-    {
-        Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts.";
-    }
-}
-
-void
-Ice::Application::shutdownOnInterrupt()
-{
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        if(_ctrlCHandler != 0)
-        {
-            Mutex::Lock lock(_mutex); // we serialize all the interrupt-setting
-            if(!_released)
-            {
-                _released = true;
-                _condVar.signal();
-            }
-            _ctrlCHandler->setCallback(shutdownOnInterruptCallback);
-        }
-    }
-    else
-    {
-        Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts.";
-    }
-}
-
-void
-Ice::Application::ignoreInterrupt()
-{
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        if(_ctrlCHandler != 0)
-        {
-            Mutex::Lock lock(_mutex); // we serialize all the interrupt-setting
-            if(!_released)
-            {
-                _released = true;
-                _condVar.signal();
-            }
-            _ctrlCHandler->setCallback(0);
-        }
-    }
-    else
-    {
-        Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts.";
-    }
-}
-
-void
-Ice::Application::callbackOnInterrupt()
-{
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        if(_ctrlCHandler != 0)
-        {
-            Mutex::Lock lock(_mutex); // we serialize all the interrupt-setting
-            if(!_released)
-            {
-                _released = true;
-                _condVar.signal();
-            }
-            _ctrlCHandler->setCallback(callbackOnInterruptCallback);
-        }
-    }
-    else
-    {
-        Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts.";
-    }
-}
-
-void
-Ice::Application::holdInterrupt()
-{
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        if(_ctrlCHandler != 0)
-        {
-            Mutex::Lock lock(_mutex); // we serialize all the interrupt-setting
-            if(_released)
-            {
-                _released = false;
-                _previousCallback = _ctrlCHandler->setCallback(holdInterruptCallback);
-            }
-            // else, we were already holding signals
-        }
-    }
-    else
-    {
-        Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts.";
-    }
-}
-
-void
-Ice::Application::releaseInterrupt()
-{
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        if(_ctrlCHandler != 0)
-        {
-            Mutex::Lock lock(_mutex); // we serialize all the interrupt-setting
-            if(!_released)
-            {
-                //
-                // Note that it's very possible no signal is held;
-                // in this case the callback is just replaced and
-                // setting _released to true and signalling _condVar
-                // do no harm.
-                //
-
-                _released = true;
-                _ctrlCHandler->setCallback(_previousCallback);
-                _condVar.signal();
-            }
-            // Else nothing to release.
-        }
-    }
-    else
-    {
-        Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts.";
-    }
-}
-
-bool
-Ice::Application::interrupted()
-{
-    Mutex::Lock lock(_mutex);
-    return _interrupted;
-}
-
-int
-Ice::Application::doMain(int argc, char* argv[], const InitializationData& initData, int version)
-{
-    int status;
-
-    try
-    {
-        _interrupted = false;
-
-        //
-        // If the process logger is the default logger, we now replace it with a
-        // a logger which is using the program name for the prefix.
-        //
-        if(initData.properties->getProperty("Ice.ProgramName") != "" && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
-        {
-            const bool convert =
-                initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
-                initData.properties->getProperty("Ice.StdErr").empty();
-
-            setProcessLogger(ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert));
-        }
-
-        _communicator = initialize(argc, argv, initData, version);
-        _destroyed = false;
-
-        //
-        // The default is to destroy when a signal is received.
-        //
-        if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-        {
-            destroyOnInterrupt();
-        }
-
-        status = run(argc, argv);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        Error out(getProcessLogger());
-        out << ex;
-        status = EXIT_FAILURE;
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(getProcessLogger());
-        out << ex;
-        status = EXIT_FAILURE;
-    }
-    catch(const std::string& msg)
-    {
-        Error out(getProcessLogger());
-        out << msg;
-        status = EXIT_FAILURE;
-    }
-    catch(const char* msg)
-    {
-        Error out(getProcessLogger());
-        out << msg;
-        status = EXIT_FAILURE;
-    }
-    catch(...)
-    {
-        Error out(getProcessLogger());
-        out << "unknown exception";
-        status = EXIT_FAILURE;
-    }
-
-    //
-    // Don't want any new interrupt and at this point (post-run),
-    // it would not make sense to release a held signal to run
-    // shutdown or destroy.
-    //
-    if(_signalPolicy == ICE_ENUM(SignalPolicy, HandleSignals))
-    {
-        ignoreInterrupt();
-    }
-
-    {
-        Mutex::Lock lock(_mutex);
-        while(_callbackInProgress)
-        {
-            _condVar.wait(lock);
-        }
-        if(_destroyed)
-        {
-            _communicator = 0;
-        }
-        else
-        {
-            _destroyed = true;
-            //
-            // And _communicator != 0, meaning will be destroyed
-            // next, _destroyed = true also ensures that any
-            // remaining callback won't do anything
-            //
-        }
-        _application = 0;
-    }
-
-    if(_communicator != 0)
-    {
-        _communicator->destroy();
-        _communicator = 0;
-    }
-
-    return status;
-}
-
-//
-// CtrlCHandler callbacks.
-//
-
-void
-Ice::Application::holdInterruptCallback(int signal)
-{
-    CtrlCHandlerCallback callback = ICE_NULLPTR;
-    {
-        Mutex::Lock lock(_mutex);
-        while(!_released)
-        {
-            _condVar.wait(lock);
-        }
-
-        if(_destroyed)
-        {
-            //
-            // Being destroyed by main thread
-            //
-            return;
-        }
-        assert(_ctrlCHandler != 0);
-        callback = _ctrlCHandler->getCallback();
-    }
-
-    if(callback)
-    {
-        callback(signal);
-    }
-}
-
-void
-Ice::Application::destroyOnInterruptCallback(int signal)
-{
-    {
-        Mutex::Lock lock(_mutex);
-        if(_destroyed)
-        {
-            //
-            // Being destroyed by main thread
-            //
-            return;
-        }
-        if(_nohup && signal == static_cast<int>(SIGHUP))
-        {
-            return;
-        }
-
-        assert(!_callbackInProgress);
-        _callbackInProgress = true;
-        _interrupted = true;
-        _destroyed = true;
-    }
-
-    assert(_communicator != 0);
-    _communicator->destroy();
-
-    {
-        Mutex::Lock lock(_mutex);
-        _callbackInProgress = false;
-    }
-    _condVar.signal();
-}
-
-void
-Ice::Application::shutdownOnInterruptCallback(int signal)
-{
-    {
-        Mutex::Lock lock(_mutex);
-        if(_destroyed)
-        {
-            //
-            // Being destroyed by main thread
-            //
-            return;
-        }
-        if(_nohup && signal == static_cast<int>(SIGHUP))
-        {
-            return;
-        }
-
-        assert(!_callbackInProgress);
-        _callbackInProgress = true;
-        _interrupted = true;
-    }
-
-    assert(_communicator != 0);
-    _communicator->shutdown();
-
-    {
-        Mutex::Lock lock(_mutex);
-        _callbackInProgress = false;
-    }
-    _condVar.signal();
-}
-
-void
-Ice::Application::callbackOnInterruptCallback(int signal)
-{
-    {
-        Mutex::Lock lock(_mutex);
-        if(_destroyed)
-        {
-            //
-            // Being destroyed by main thread
-            //
-            return;
-        }
-        // For SIGHUP the user callback is always called. It can
-        // decide what to do.
-        assert(!_callbackInProgress);
-        _callbackInProgress = true;
-        _interrupted = true;
-    }
-
-    try
-    {
-        assert(_application != 0);
-        _application->interruptCallback(signal);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        Error out(getProcessLogger());
-        out << "(while interrupting in response to signal " << signal << "): Ice::Exception: " << ex;
-    }
-    catch(const std::exception& ex)
-    {
-        Error out(getProcessLogger());
-        out << "(while interrupting in response to signal " << signal << "): std::exception: " << ex;
-    }
-    catch(const std::string& msg)
-    {
-        Error out(getProcessLogger());
-        out << "(while interrupting in response to signal " << signal << "): " << msg;
-    }
-    catch(const char* msg)
-    {
-        Error out(getProcessLogger());
-        out << "(while interrupting in response to signal " << signal << "): " << msg;
-    }
-    catch(...)
-    {
-        Error out(getProcessLogger());
-        out << "(while interrupting in response to signal " << signal << "): unknown exception";
-    }
-
-    {
-        Mutex::Lock lock(_mutex);
-        _callbackInProgress = false;
-    }
-    _condVar.signal();
-}
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index 55a1d488856..c773d4f6b09 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -29,8 +29,13 @@ main(int argc, char* argv[])
 
     try
     {
+        Ice::CtrlCHandler ctrlCHandler;
         Ice::CommunicatorHolder ich(argc, argv);
-        status = run(ich.communicator(), Ice::argsToStringSeq(argc, argv));
+        communicator = ich.communicator();
+
+        ctrlCHandler.setCallback(&destroyCommunicator);
+
+        status = run(Ice::argsToStringSeq(argc, argv));
     }
     catch(const std::exception& ex)
     {
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp
index 7f25ecb7058..a509817f5b3 100644
--- a/cpp/src/iceserviceinstall/Install.cpp
+++ b/cpp/src/iceserviceinstall/Install.cpp
@@ -31,7 +31,7 @@ wmain(int argc, wchar_t* argv[])
 
     try
     {
-        Ice::CtrlCHandler ctrlCHandler;
+        IceUtil::CtrlCHandler ctrlCHandler;
         Ice::InitializationData id;
         id.properties = Ice::createProperties();
         id.properties->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
diff --git a/cpp/test/Glacier2/application/Callback.ice b/cpp/test/Glacier2/application/Callback.ice
deleted file mode 100644
index 260386c31b5..00000000000
--- a/cpp/test/Glacier2/application/Callback.ice
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#pragma once
-
-module Test
-{
-
-interface CallbackReceiver
-{
-    void callback();
-}
-
-interface Callback
-{
-    void initiateCallback(CallbackReceiver* proxy);
-
-    void shutdown();
-}
-
-}
diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp
deleted file mode 100644
index beed2de0ec6..00000000000
--- a/cpp/test/Glacier2/application/Client.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceUtil/IceUtil.h>
-#include <Ice/Ice.h>
-#include <Glacier2/Glacier2.h>
-
-#include <TestHelper.h>
-
-#include <iostream>
-#include <iomanip>
-#include <list>
-
-#include <Callback.h>
-
-using namespace std;
-using namespace Test;
-
-namespace
-{
-
-class CallbackReceiverI : public Test::CallbackReceiver
-{
-public:
-
-    CallbackReceiverI() : _received(false)
-    {
-    }
-
-    virtual void callback(const Ice::Current&)
-    {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-        _received = true;
-        _monitor.notify();
-    }
-
-    void waitForCallback()
-    {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
-        while(!_received)
-        {
-            _monitor.wait();
-        }
-        _received = false;
-    }
-
-    IceUtil::Monitor<IceUtil::Mutex> _monitor;
-    bool _received;
-};
-ICE_DEFINE_PTR(CallbackReceiverIPtr, CallbackReceiverI);
-
-class Application : public Glacier2::Application
-{
-public:
-
-    Application() : _restart(0), _destroyed(false), _receiver(ICE_MAKE_SHARED(CallbackReceiverI))
-    {
-    }
-
-    virtual Glacier2::SessionPrxPtr
-    createSession()
-    {
-        return ICE_UNCHECKED_CAST(Glacier2::SessionPrx, router()->createSession("userid", "abc123"));
-    }
-
-    virtual int
-    runWithSession(int, char*[])
-    {
-        test(router());
-        test(!categoryForClient().empty());
-        test(objectAdapter());
-
-        if(_restart == 0)
-        {
-            cout << "testing Glacier2::Application restart... " << flush;
-        }
-        Ice::ObjectPrxPtr base = communicator()->stringToProxy(
-            "callback:" + TestHelper::getTestEndpoint(communicator()->getProperties()));
-        CallbackPrxPtr callback = ICE_UNCHECKED_CAST(CallbackPrx, base);
-        if(++_restart < 5)
-        {
-            CallbackReceiverPrxPtr receiver = ICE_UNCHECKED_CAST(CallbackReceiverPrx, addWithUUID(_receiver));
-            callback->initiateCallback(receiver);
-            _receiver->waitForCallback();
-            restart();
-        }
-        cout << "ok" << endl;
-
-        cout << "testing server shutdown... " << flush;
-        callback->shutdown();
-        cout << "ok" << endl;
-
-        return 0;
-    }
-
-    virtual void sessionDestroyed()
-    {
-        _destroyed = true;
-    }
-
-    int _restart;
-    bool _destroyed;
-    CallbackReceiverIPtr _receiver;
-};
-
-} // anonymous namespace end
-
-class Client : public Test::TestHelper
-{
-public:
-
-    void run(int, char**);
-};
-
-void
-Client::run(int argc, char** argv)
-{
-    Application app;
-    Ice::InitializationData initData;
-    initData.properties = createTestProperties(argc, argv);
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
-    initData.properties->setProperty("Ice.Default.Router",
-                                     "Glacier2/router:" + TestHelper::getTestEndpoint(initData.properties, 50));
-    int status = app.main(argc, argv, initData);
-    if(status != 0)
-    {
-        test(false);
-    }
-
-    initData.properties->setProperty("Ice.Default.Router", "");
-
-    Ice::CommunicatorHolder communicator = initialize(argc, argv, initData);
-
-    cout << "testing stringToProxy for process object... " << flush;
-    Ice::ObjectPrxPtr processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
-    cout << "ok" << endl;
-
-    cout << "testing checked cast for admin object... " << flush;
-    Ice::ProcessPrxPtr process = ICE_CHECKED_CAST(Ice::ProcessPrx, processBase);
-    test(process != 0);
-    cout << "ok" << endl;
-
-    cout << "testing Glacier2 shutdown... " << flush;
-    process->shutdown();
-
-    try
-    {
-        process->ice_ping();
-        test(false);
-    }
-    catch(const Ice::LocalException&)
-    {
-        cout << "ok" << endl;
-    }
-
-    test(app._restart == 5);
-    test(app._destroyed);
-}
-
-DEFINE_TEST(Client)
diff --git a/cpp/test/Glacier2/application/Makefile.mk b/cpp/test/Glacier2/application/Makefile.mk
deleted file mode 100644
index 23916e5dece..00000000000
--- a/cpp/test/Glacier2/application/Makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-
-$(test)_client_sources = Client.cpp Callback.ice
-$(test)_client_dependencies = Glacier2
-
-$(test)_server_sources = Server.cpp Callback.ice
-
-tests += $(test)
diff --git a/cpp/test/Glacier2/application/Server.cpp b/cpp/test/Glacier2/application/Server.cpp
deleted file mode 100644
index 0f3170e7933..00000000000
--- a/cpp/test/Glacier2/application/Server.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceUtil/IceUtil.h>
-#include <Ice/Ice.h>
-#include <TestHelper.h>
-#include <Callback.h>
-
-using namespace std;
-using namespace Test;
-
-namespace
-{
-
-class CallbackI : public Callback
-{
-
-public:
-
-    virtual void
-    initiateCallback(ICE_IN(CallbackReceiverPrxPtr) proxy, const Ice::Current& current)
-    {
-        proxy->callback(current.ctx);
-    }
-
-    virtual void
-    shutdown(const Ice::Current& current)
-    {
-        current.adapter->getCommunicator()->shutdown();
-    }
-};
-
-}
-
-class Server : public Test::TestHelper
-{
-public:
-
-    void run(int, char**);
-};
-
-void
-Server::run(int argc, char** argv)
-{
-    Ice::CommunicatorHolder communicator = initialize(argc, argv);
-    communicator->getProperties()->setProperty("DeactivatedAdapter.Endpoints", getTestEndpoint(1));
-    communicator->createObjectAdapter("DeactivatedAdapter");
-
-    communicator->getProperties()->setProperty("CallbackAdapter.Endpoints", getTestEndpoint());
-    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("CallbackAdapter");
-    adapter->add(ICE_MAKE_SHARED(CallbackI), Ice::stringToIdentity("callback"));
-    adapter->activate();
-    communicator->waitForShutdown();
-}
-
-DEFINE_TEST(Server)
diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj
deleted file mode 100644
index a316f04c082..00000000000
--- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj
+++ /dev/null
@@ -1,350 +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>
-  <ItemGroup>
-    <ClCompile Include="..\..\Client.cpp" />
-    <ClCompile Include="Win32\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Callback.ice" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Win32\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{24916CD9-F28F-436C-8F20-B22BE0555601}</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>
-  <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/Glacier2/application/msbuild/client/client.vcxproj.filters b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters
deleted file mode 100644
index e8aeb3b7b56..00000000000
--- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{837435c1-089b-4ee8-9cf9-536a239f7043}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Slice Files">
-      <UniqueIdentifier>{a99f24c4-eadc-44a9-967d-415d1eb7103a}</UniqueIdentifier>
-      <Extensions>ice</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{56f8f0ac-dffd-44af-93c0-f098a74db69c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64">
-      <UniqueIdentifier>{88bd7ae4-6c8f-44dc-931a-ba357d00b12f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{8f989f90-694e-4fa1-bf6c-3bf5fd271428}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64">
-      <UniqueIdentifier>{8fc9f9d6-650f-497a-afd2-1a8d6e024ebc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{b66a1974-9417-412d-a2af-5b170bfe1d82}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32">
-      <UniqueIdentifier>{50dd5049-f2ea-467a-bba2-d0d9c8d59279}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{055389ac-0ac8-4f0d-b8fb-c0812c773bb3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32">
-      <UniqueIdentifier>{1f525397-1eb1-4c02-bc95-f222f3c8540f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{1a869942-bfa4-49e7-b3fc-bacf830f4a90}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Debug">
-      <UniqueIdentifier>{cc80a20c-a151-47f2-8938-42c2ca6cd442}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Debug">
-      <UniqueIdentifier>{7c7d3d05-978d-4874-801d-c9b11c10d23b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Debug">
-      <UniqueIdentifier>{03a157f1-6b52-4da0-b4e1-179c3416baa1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Debug">
-      <UniqueIdentifier>{e1a4db14-ed6c-43ae-974d-1e69bbcaac03}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Release">
-      <UniqueIdentifier>{12267381-5bfd-41da-b1e3-704b45b40bbe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Release">
-      <UniqueIdentifier>{9af99a3b-28ea-4c83-849b-6e765dfa71c7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Release">
-      <UniqueIdentifier>{dd2caf65-58ac-41d0-a17d-44a7990dc794}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Release">
-      <UniqueIdentifier>{01fdf776-1917-46c8-bd0a-5f836deeb0fd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{2848c29f-1ac7-4488-af2b-0dde6a110b29}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{215a0913-787e-4310-82fe-d33b84b61d82}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{df2011e3-2bcf-4597-8312-bbfee3924ef2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{e19e13c7-f8e7-45a9-8716-c21069970ab2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Client.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Callback.cpp">
-      <Filter>Source Files\x64\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Debug\Callback.cpp">
-      <Filter>Source Files\Win32\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Callback.cpp">
-      <Filter>Source Files\x64\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Callback.cpp">
-      <Filter>Source Files\Win32\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Callback.cpp">
-      <Filter>Source Files\x64\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Callback.cpp">
-      <Filter>Source Files\Win32\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Callback.cpp">
-      <Filter>Source Files\x64\Cpp11-Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Callback.cpp">
-      <Filter>Source Files\Win32\Cpp11-Release</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="x64\Cpp11-Debug\Callback.h">
-      <Filter>Header Files\x64\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Debug\Callback.h">
-      <Filter>Header Files\Win32\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Callback.h">
-      <Filter>Header Files\x64\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Callback.h">
-      <Filter>Header Files\Win32\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Callback.h">
-      <Filter>Header Files\x64\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Callback.h">
-      <Filter>Header Files\Win32\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Callback.h">
-      <Filter>Header Files\x64\Cpp11-Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Callback.h">
-      <Filter>Header Files\Win32\Cpp11-Release</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Callback.ice">
-      <Filter>Slice Files</Filter>
-    </SliceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/cpp/test/Glacier2/application/msbuild/client/packages.config b/cpp/test/Glacier2/application/msbuild/client/packages.config
deleted file mode 100644
index 1ab4167f703..00000000000
--- a/cpp/test/Glacier2/application/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/Glacier2/application/msbuild/server/packages.config b/cpp/test/Glacier2/application/msbuild/server/packages.config
deleted file mode 100644
index 1ab4167f703..00000000000
--- a/cpp/test/Glacier2/application/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/Glacier2/application/msbuild/server/server.vcxproj b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj
deleted file mode 100644
index ade28c196aa..00000000000
--- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj
+++ /dev/null
@@ -1,350 +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>{E17093DB-4940-4EB4-A7BB-6958A96475E2}</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>
-  <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>
-    <ClCompile Include="..\..\Server.cpp" />
-    <ClCompile Include="Win32\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Callback.ice" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Win32\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Callback.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>..\..\Callback.ice</SliceCompileSource>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <PropertyGroup Label="UserMacros" />
-  <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/Glacier2/application/msbuild/server/server.vcxproj.filters b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters
deleted file mode 100644
index 27a3784a1fa..00000000000
--- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{53c98afd-b108-4103-87df-943ea034bca6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{a5535f72-1e91-449c-9f2c-78cca0de145a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Slice Files">
-      <UniqueIdentifier>{c91158f4-a402-4978-8789-3ab4fbbb0afe}</UniqueIdentifier>
-      <Extensions>ice</Extensions>
-    </Filter>
-    <Filter Include="Source Files\x64">
-      <UniqueIdentifier>{893a9720-546f-447b-840c-676c4c25407d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{9e822431-f253-4588-88d5-fbeea4017928}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64">
-      <UniqueIdentifier>{ae45d567-212a-438e-b97f-6fa4cef9cb82}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Debug">
-      <UniqueIdentifier>{9ea797ca-88bd-4b4d-afd9-e507a346c950}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32">
-      <UniqueIdentifier>{9791cfde-3e93-48d1-840d-0d313ebd4079}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{e2a6d33e-5eaa-4d0e-963f-72b8c30d7f3e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32">
-      <UniqueIdentifier>{add40582-ecb6-4f16-9588-97c9e5931602}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Debug">
-      <UniqueIdentifier>{57720470-5ab5-450f-9c3a-1f8962685464}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Debug">
-      <UniqueIdentifier>{a341f046-db86-4534-b0e9-83a598b8afad}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Debug">
-      <UniqueIdentifier>{b19b70fe-1916-4d0d-b333-16c65946c714}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Debug">
-      <UniqueIdentifier>{2a4fd9b3-889e-4a88-9df4-ccfce4e29c03}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Debug">
-      <UniqueIdentifier>{225e2acf-a240-423a-b37e-557b42efb604}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Release">
-      <UniqueIdentifier>{e5896b77-3871-4814-aeb3-ee00818122d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Release">
-      <UniqueIdentifier>{fe3c0a85-1958-4ae1-9ba2-fa2628254925}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Release">
-      <UniqueIdentifier>{496f6c04-6570-49df-9fb1-47ae9eb1bf8e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Release">
-      <UniqueIdentifier>{84bd3212-268b-4f34-a192-665b0554940a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{f35081e8-8bf4-4794-89b2-82a6420d68cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\x64\Cpp11-Release">
-      <UniqueIdentifier>{3dbd5f85-1c6d-49b1-8cd8-2319c4275f1b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{5651fca8-a6d0-485d-a6b0-67f51b1ac266}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Win32\Cpp11-Release">
-      <UniqueIdentifier>{fc438b99-77ba-4c1a-95a4-07c67f17ea70}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Server.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Debug\Callback.cpp">
-      <Filter>Source Files\x64\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Debug\Callback.cpp">
-      <Filter>Source Files\Win32\Cpp11-Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Debug\Callback.cpp">
-      <Filter>Source Files\x64\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Debug\Callback.cpp">
-      <Filter>Source Files\Win32\Debug</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Release\Callback.cpp">
-      <Filter>Source Files\x64\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Release\Callback.cpp">
-      <Filter>Source Files\Win32\Release</Filter>
-    </ClCompile>
-    <ClCompile Include="x64\Cpp11-Release\Callback.cpp">
-      <Filter>Source Files\x64\Cpp11-Release</Filter>
-    </ClCompile>
-    <ClCompile Include="Win32\Cpp11-Release\Callback.cpp">
-      <Filter>Source Files\Win32\Cpp11-Release</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="x64\Cpp11-Debug\Callback.h">
-      <Filter>Header Files\x64\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Debug\Callback.h">
-      <Filter>Header Files\Win32\Cpp11-Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Debug\Callback.h">
-      <Filter>Header Files\x64\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Debug\Callback.h">
-      <Filter>Header Files\Win32\Debug</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Release\Callback.h">
-      <Filter>Header Files\x64\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Release\Callback.h">
-      <Filter>Header Files\Win32\Release</Filter>
-    </ClInclude>
-    <ClInclude Include="x64\Cpp11-Release\Callback.h">
-      <Filter>Header Files\x64\Cpp11-Release</Filter>
-    </ClInclude>
-    <ClInclude Include="Win32\Cpp11-Release\Callback.h">
-      <Filter>Header Files\Win32\Cpp11-Release</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\Callback.ice">
-      <Filter>Slice Files</Filter>
-    </SliceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/cpp/test/Ice/properties/Client.cpp b/cpp/test/Ice/properties/Client.cpp
index d779106aa2b..7bc65015eac 100644
--- a/cpp/test/Ice/properties/Client.cpp
+++ b/cpp/test/Ice/properties/Client.cpp
@@ -13,23 +13,6 @@ namespace
 
 string configPath;
 
-class TestApplication : public Ice::Application
-{
-public:
-
-    virtual int
-    run(int, char*[])
-    {
-        Ice::PropertiesPtr properties = communicator()->getProperties();
-        test(properties->getProperty("Ice.Trace.Network") == "1");
-        test(properties->getProperty("Ice.Trace.Protocol") == "1");
-        test(properties->getProperty("Config.Path") == configPath);
-        test(properties->getProperty("Ice.ProgramName") == "PropertiesClient");
-        test(appName() == properties->getProperty("Ice.ProgramName"));
-        return EXIT_SUCCESS;
-    }
-};
-
 }
 
 class Client : public Test::TestHelper
@@ -40,7 +23,7 @@ public:
 };
 
 void
-Client::run(int argc, char** argv)
+Client::run(int, char**)
 {
     ifstream in("./config/configPath");
     if(!in)
@@ -65,13 +48,6 @@ Client::run(int argc, char** argv)
     }
 
     {
-        cout << "testing load properties from UTF-8 path using Ice::Application... " << flush;
-        TestApplication app;
-        app.main(argc, argv, configPath.c_str());
-        cout << "ok" << endl;
-    }
-
-    {
         cout << "testing using Ice.Config with multiple config files... " << flush;
         Ice::PropertiesPtr properties;
         Ice::StringSeq args;
diff --git a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
index 6e15bad1c0d..0651250f7dd 100644
--- a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
+++ b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp
@@ -4,6 +4,7 @@
 
 #include <Ice/Ice.h>
 #include <Glacier2/PermissionsVerifier.h>
+#include <TestHelper.h>
 
 using namespace std;
 
@@ -18,23 +19,18 @@ public:
     }
 };
 
-class PermissionsVerifierServer : public Ice::Application
+class Server : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[])
+    virtual void run(int argc, char** argv)
     {
-        Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("PermissionsVerifier");
+        Ice::CommunicatorHolder communicator = initialize(argc, argv);
+        Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("PermissionsVerifier");
         adapter->add(new PermissionsVerifierI, Ice::stringToIdentity("PermissionsVerifier"));
         adapter->activate();
-        communicator()->waitForShutdown();
-        return EXIT_SUCCESS;
+        communicator->waitForShutdown();
     }
 };
 
-int
-main(int argc, char* argv[])
-{
-    PermissionsVerifierServer app;
-    return app.main(argc, argv);
-}
+DEFINE_TEST(Server)