summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-10-21 16:27:28 +0200
committerJoe George <joe@zeroc.com>2021-02-02 10:38:58 -0500
commit4b46039f47f87c3b80d1788159251473da196fb2 (patch)
tree09f65cd06277a59d2ac7fcbc335fa7951d92e0e1 /cpp/test
parentIceGrid and IceStorm (diff)
downloadice-4b46039f47f87c3b80d1788159251473da196fb2.tar.bz2
ice-4b46039f47f87c3b80d1788159251473da196fb2.tar.xz
ice-4b46039f47f87c3b80d1788159251473da196fb2.zip
Remove Ice::Application & Glacier2::Application deprecated classes
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Glacier2/application/Callback.ice22
-rw-r--r--cpp/test/Glacier2/application/Client.cpp161
-rw-r--r--cpp/test/Glacier2/application/Makefile.mk10
-rw-r--r--cpp/test/Glacier2/application/Server.cpp57
-rw-r--r--cpp/test/Glacier2/application/msbuild/client/client.vcxproj350
-rw-r--r--cpp/test/Glacier2/application/msbuild/client/client.vcxproj.filters138
-rw-r--r--cpp/test/Glacier2/application/msbuild/client/packages.config8
-rw-r--r--cpp/test/Glacier2/application/msbuild/server/packages.config8
-rw-r--r--cpp/test/Glacier2/application/msbuild/server/server.vcxproj350
-rw-r--r--cpp/test/Glacier2/application/msbuild/server/server.vcxproj.filters138
-rw-r--r--cpp/test/Ice/properties/Client.cpp26
-rw-r--r--cpp/test/IceGrid/allocation/PermissionsVerifier.cpp18
12 files changed, 8 insertions, 1278 deletions
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)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:21:28 +0000