diff --git a/config/Make.rules b/config/Make.rules
index 9d74456261c..6f77969e782 100644
--- a/config/Make.rules
+++ b/config/Make.rules
@@ -103,9 +103,9 @@ supported-languages ?= $(strip cpp java python ruby php \
supported-configs ?= shared
default-configs ?= $(firstword $(supported-configs))
-version = 3.7.10
-mmversion = 3.7
-soversion = 37
+version = 3.8a0
+mmversion = 3.8
+soversion = 38a0
#
# The compatversion is the lowest patch release with the same API.
diff --git a/config/icebuilder.props b/config/icebuilder.props
index 71dca45e704..fb391ac4924 100644
--- a/config/icebuilder.props
+++ b/config/icebuilder.props
@@ -2,10 +2,10 @@
- 3.7.10
- 30710
- 3.7
- 37
- 3.7.10
+ 3.8a0
+ 30850
+ 3.8
+ 38a0
+ 3.8.0-alpha0
diff --git a/config/iphoneos-SDKSettings.plist b/config/iphoneos-SDKSettings.plist
index 9d7c9dc4a51..a93386c96e8 100644
--- a/config/iphoneos-SDKSettings.plist
+++ b/config/iphoneos-SDKSettings.plist
@@ -18,6 +18,6 @@
IsBaseSDK
NO
Version
- 3.7.10
+ 3.8a0
diff --git a/config/iphonesimulator-SDKSettings.plist b/config/iphonesimulator-SDKSettings.plist
index e65deef6dc9..27c4e810b1e 100644
--- a/config/iphonesimulator-SDKSettings.plist
+++ b/config/iphonesimulator-SDKSettings.plist
@@ -18,6 +18,6 @@
IsBaseSDK
NO
Version
- 3.7.10
+ 3.8a0
diff --git a/config/macosx-SDKSettings.plist b/config/macosx-SDKSettings.plist
index e997b7c48c5..0ed480b43f5 100644
--- a/config/macosx-SDKSettings.plist
+++ b/config/macosx-SDKSettings.plist
@@ -18,6 +18,6 @@
IsBaseSDK
NO
Version
- 3.7.10
+ 3.8a0
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index aab103a9c67..79355bd7b3a 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -28,7 +28,7 @@
-
+
-
+
-//
-// Generated from file `Communicator.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Communicator_h__
#define __Ice_Communicator_h__
@@ -45,18 +34,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/CommunicatorF.h b/cpp/include/Ice/CommunicatorF.h
index 54b7b4a3c16..bf9840d8d96 100644
--- a/cpp/include/Ice/CommunicatorF.h
+++ b/cpp/include/Ice/CommunicatorF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `CommunicatorF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_CommunicatorF_h__
#define __Ice_CommunicatorF_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/Connection.h b/cpp/include/Ice/Connection.h
index c1a1c9e3406..d0b0e7cf582 100644
--- a/cpp/include/Ice/Connection.h
+++ b/cpp/include/Ice/Connection.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Connection.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Connection_h__
#define __Ice_Connection_h__
@@ -32,18 +21,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/ConnectionF.h b/cpp/include/Ice/ConnectionF.h
index 767af6dd413..fe0db843c42 100644
--- a/cpp/include/Ice/ConnectionF.h
+++ b/cpp/include/Ice/ConnectionF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_ConnectionF_h__
#define __Ice_ConnectionF_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/Current.h b/cpp/include/Ice/Current.h
index 0e6c08569b5..cdca588f277 100644
--- a/cpp/include/Ice/Current.h
+++ b/cpp/include/Ice/Current.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Current.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Current_h__
#define __Ice_Current_h__
@@ -34,18 +23,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/Endpoint.h b/cpp/include/Ice/Endpoint.h
index 84acbf4a982..0cb34425e2d 100644
--- a/cpp/include/Ice/Endpoint.h
+++ b/cpp/include/Ice/Endpoint.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Endpoint.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Endpoint_h__
#define __Ice_Endpoint_h__
@@ -31,18 +20,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/EndpointF.h b/cpp/include/Ice/EndpointF.h
index ac10bf1af00..531e60e5291 100644
--- a/cpp/include/Ice/EndpointF.h
+++ b/cpp/include/Ice/EndpointF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_EndpointF_h__
#define __Ice_EndpointF_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/EndpointSelectionType.h b/cpp/include/Ice/EndpointSelectionType.h
index 59480ca58ff..b51dea15fb7 100644
--- a/cpp/include/Ice/EndpointSelectionType.h
+++ b/cpp/include/Ice/EndpointSelectionType.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointTypes.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_EndpointSelectionType_h__
#define __Ice_EndpointSelectionType_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/ImplicitContext.h b/cpp/include/Ice/ImplicitContext.h
index 8dddd2ec545..b6ca68e6a2d 100644
--- a/cpp/include/Ice/ImplicitContext.h
+++ b/cpp/include/Ice/ImplicitContext.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ImplicitContext.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_ImplicitContext_h__
#define __Ice_ImplicitContext_h__
@@ -31,18 +20,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/ImplicitContextF.h b/cpp/include/Ice/ImplicitContextF.h
index 1edb0642c3a..b39be27ba0c 100644
--- a/cpp/include/Ice/ImplicitContextF.h
+++ b/cpp/include/Ice/ImplicitContextF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ImplicitContextF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_ImplicitContextF_h__
#define __Ice_ImplicitContextF_h__
@@ -28,28 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
-#ifndef ICE_API
-# if defined(ICE_STATIC_LIBS)
-# define ICE_API /**/
-# elif defined(ICE_API_EXPORTS)
-# define ICE_API ICE_DECLSPEC_EXPORT
-# else
-# define ICE_API ICE_DECLSPEC_IMPORT
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace Ice
diff --git a/cpp/include/Ice/LocalException.h b/cpp/include/Ice/LocalException.h
index c29a702e06a..53428850e75 100644
--- a/cpp/include/Ice/LocalException.h
+++ b/cpp/include/Ice/LocalException.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `LocalException.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_LocalException_h__
#define __Ice_LocalException_h__
@@ -32,18 +21,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/Logger.h b/cpp/include/Ice/Logger.h
index 82821bb3dfb..d6dbd886f04 100644
--- a/cpp/include/Ice/Logger.h
+++ b/cpp/include/Ice/Logger.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Logger.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Logger_h__
#define __Ice_Logger_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/LoggerF.h b/cpp/include/Ice/LoggerF.h
index 69e3c1dccfc..54bf0cb669e 100644
--- a/cpp/include/Ice/LoggerF.h
+++ b/cpp/include/Ice/LoggerF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `LoggerF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_LoggerF_h__
#define __Ice_LoggerF_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/Plugin.h b/cpp/include/Ice/Plugin.h
index f94c713eb12..16e9f80cb2d 100644
--- a/cpp/include/Ice/Plugin.h
+++ b/cpp/include/Ice/Plugin.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Plugin.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Plugin_h__
#define __Ice_Plugin_h__
@@ -30,18 +19,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/PluginF.h b/cpp/include/Ice/PluginF.h
index 1b8dcfcee03..54262aece7f 100644
--- a/cpp/include/Ice/PluginF.h
+++ b/cpp/include/Ice/PluginF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `PluginF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_PluginF_h__
#define __Ice_PluginF_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h
index d2c4a2e683d..e77b08ead66 100644
--- a/cpp/include/Ice/Properties.h
+++ b/cpp/include/Ice/Properties.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Properties.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_Properties_h__
#define __Ice_Properties_h__
@@ -34,18 +23,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/Ice/PropertiesF.h b/cpp/include/Ice/PropertiesF.h
index 686f95b4e63..e439f5ed903 100644
--- a/cpp/include/Ice/PropertiesF.h
+++ b/cpp/include/Ice/PropertiesF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `PropertiesF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Ice_PropertiesF_h__
#define __Ice_PropertiesF_h__
@@ -29,18 +18,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICE_API
# if defined(ICE_STATIC_LIBS)
# define ICE_API /**/
diff --git a/cpp/include/IceBT/ConnectionInfo.h b/cpp/include/IceBT/ConnectionInfo.h
index 11c87c8a8a3..ca5360ce68b 100644
--- a/cpp/include/IceBT/ConnectionInfo.h
+++ b/cpp/include/IceBT/ConnectionInfo.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceBT_ConnectionInfo_h__
#define __IceBT_ConnectionInfo_h__
@@ -30,18 +19,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEBT_API
# if defined(ICE_STATIC_LIBS)
# define ICEBT_API /**/
diff --git a/cpp/include/IceBT/EndpointInfo.h b/cpp/include/IceBT/EndpointInfo.h
index 91d847dda8a..365410cf832 100644
--- a/cpp/include/IceBT/EndpointInfo.h
+++ b/cpp/include/IceBT/EndpointInfo.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceBT_EndpointInfo_h__
#define __IceBT_EndpointInfo_h__
@@ -29,18 +18,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEBT_API
# if defined(ICE_STATIC_LIBS)
# define ICEBT_API /**/
diff --git a/cpp/include/IceBT/Types.h b/cpp/include/IceBT/Types.h
index 24d3335e8c0..7a29d477820 100644
--- a/cpp/include/IceBT/Types.h
+++ b/cpp/include/IceBT/Types.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Types.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceBT_Types_h__
#define __IceBT_Types_h__
@@ -29,18 +18,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEBT_API
# if defined(ICE_STATIC_LIBS)
# define ICEBT_API /**/
diff --git a/cpp/include/IceBox/Service.h b/cpp/include/IceBox/Service.h
index 52a38ab8c12..724246df8cc 100644
--- a/cpp/include/IceBox/Service.h
+++ b/cpp/include/IceBox/Service.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `IceBox.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceBox_Service_h__
#define __IceBox_Service_h__
@@ -38,18 +27,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEBOX_API
# if defined(ICE_STATIC_LIBS)
# define ICEBOX_API /**/
diff --git a/cpp/include/IceGrid/PluginFacade.h b/cpp/include/IceGrid/PluginFacade.h
index 453d34560e9..a197a38db74 100644
--- a/cpp/include/IceGrid/PluginFacade.h
+++ b/cpp/include/IceGrid/PluginFacade.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `PluginFacade.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceGrid_PluginFacade_h__
#define __IceGrid_PluginFacade_h__
@@ -40,18 +29,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEGRID_API
# if defined(ICE_STATIC_LIBS)
# define ICEGRID_API /**/
diff --git a/cpp/include/IceIAP/ConnectionInfo.h b/cpp/include/IceIAP/ConnectionInfo.h
index a617a2bacae..aae310246d2 100644
--- a/cpp/include/IceIAP/ConnectionInfo.h
+++ b/cpp/include/IceIAP/ConnectionInfo.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceIAP_ConnectionInfo_h__
#define __IceIAP_ConnectionInfo_h__
@@ -30,18 +19,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEIAP_API
# if defined(ICE_STATIC_LIBS)
# define ICEIAP_API /**/
diff --git a/cpp/include/IceIAP/EndpointInfo.h b/cpp/include/IceIAP/EndpointInfo.h
index 3b5f8690949..ec146eb658e 100644
--- a/cpp/include/IceIAP/EndpointInfo.h
+++ b/cpp/include/IceIAP/EndpointInfo.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceIAP_EndpointInfo_h__
#define __IceIAP_EndpointInfo_h__
@@ -29,18 +18,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICEIAP_API
# if defined(ICE_STATIC_LIBS)
# define ICEIAP_API /**/
diff --git a/cpp/include/IceSSL/ConnectionInfo.h b/cpp/include/IceSSL/ConnectionInfo.h
index 4d0f0829242..d7d3c209e72 100644
--- a/cpp/include/IceSSL/ConnectionInfo.h
+++ b/cpp/include/IceSSL/ConnectionInfo.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceSSL_ConnectionInfo_h__
#define __IceSSL_ConnectionInfo_h__
@@ -31,18 +20,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICESSL_API
# if defined(ICE_STATIC_LIBS)
# define ICESSL_API /**/
diff --git a/cpp/include/IceSSL/ConnectionInfoF.h b/cpp/include/IceSSL/ConnectionInfoF.h
index 7451a6ada1f..995ddad3144 100644
--- a/cpp/include/IceSSL/ConnectionInfoF.h
+++ b/cpp/include/IceSSL/ConnectionInfoF.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfoF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceSSL_ConnectionInfoF_h__
#define __IceSSL_ConnectionInfoF_h__
@@ -28,18 +17,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICESSL_API
# if defined(ICE_STATIC_LIBS)
# define ICESSL_API /**/
diff --git a/cpp/include/IceSSL/EndpointInfo.h b/cpp/include/IceSSL/EndpointInfo.h
index 5251031acb1..1ec16043d15 100644
--- a/cpp/include/IceSSL/EndpointInfo.h
+++ b/cpp/include/IceSSL/EndpointInfo.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceSSL_EndpointInfo_h__
#define __IceSSL_EndpointInfo_h__
@@ -29,18 +18,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifndef ICESSL_API
# if defined(ICE_STATIC_LIBS)
# define ICESSL_API /**/
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 7a16824b47d..5334db4300f 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -205,9 +205,9 @@
//
// The Ice version.
//
-#define ICE_STRING_VERSION "3.7.10" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30710 // AABBCC, with AA=major, BB=minor, CC=patch
-#define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
+#define ICE_STRING_VERSION "3.8.0-alpha.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30850 // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_SO_VERSION "38a0" // "ABC", with A=major, B=minor, C=patch
#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
# define ICE_BUILDING_ICE
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index c76641da1f8..47790d3b92d 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -7,9 +7,9 @@
#include "winver.h"
-#define ICE_VERSION 3,7,10,0
-#define ICE_STRING_VERSION "3.7.10\0"
-#define ICE_SO_VERSION "37\0"
+#define ICE_VERSION 3,8,0,0
+#define ICE_STRING_VERSION "3.8.0-alpha.0\0"
+#define ICE_SO_VERSION "38a0\0"
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
#define ICE_PRODUCT_NAME "Ice\0"
diff --git a/cpp/msbuild/ice.test.props b/cpp/msbuild/ice.test.props
index bb0f6196324..f856d524e36 100644
--- a/cpp/msbuild/ice.test.props
+++ b/cpp/msbuild/ice.test.props
@@ -2,7 +2,7 @@
- 37
+ 38a0
diff --git a/cpp/msbuild/zeroc.ice.v143.nuspec b/cpp/msbuild/zeroc.ice.v143.nuspec
index 2f19e9a5e9b..147bff67220 100644
--- a/cpp/msbuild/zeroc.ice.v143.nuspec
+++ b/cpp/msbuild/zeroc.ice.v143.nuspec
@@ -3,7 +3,7 @@
zeroc.ice.v143
ZeroC Ice C++ for Visual Studio 2022
- 3.7.10
+ 3.8.0-alpha0
ZeroC
Copyright (c) ZeroC, Inc. All rights reserved
GPL-2.0-only
diff --git a/cpp/msbuild/zeroc.ice.v143.props b/cpp/msbuild/zeroc.ice.v143.props
index e82ce0d3cc4..0e02504f17e 100644
--- a/cpp/msbuild/zeroc.ice.v143.props
+++ b/cpp/msbuild/zeroc.ice.v143.props
@@ -2,11 +2,11 @@
- 3.7.10
- 30710
- 3.7
- 37
- 3.7.10
+ 3.8a0
+ 30800
+ 3.8
+ 38a0
+ 3.8.0-alpha0
$(MSBuildThisFileDirectory)..\..
$(IceHome)\tools
diff --git a/cpp/msbuild/zeroc.ice.v143.targets b/cpp/msbuild/zeroc.ice.v143.targets
index ec6604c76aa..d48a6ef96a6 100644
--- a/cpp/msbuild/zeroc.ice.v143.targets
+++ b/cpp/msbuild/zeroc.ice.v143.targets
@@ -30,8 +30,8 @@
-
+
diff --git a/cpp/src/Glacier2/Instrumentation.cpp b/cpp/src/Glacier2/Instrumentation.cpp
index ac98cf7ed16..8e4181985a0 100644
--- a/cpp/src/Glacier2/Instrumentation.cpp
+++ b/cpp/src/Glacier2/Instrumentation.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Instrumentation.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#include
#include
@@ -27,18 +16,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Glacier2/Instrumentation.h b/cpp/src/Glacier2/Instrumentation.h
index 5e96a315c64..7ef3a6774a0 100644
--- a/cpp/src/Glacier2/Instrumentation.h
+++ b/cpp/src/Glacier2/Instrumentation.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Instrumentation.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __Glacier2_Instrumentation_h__
#define __Glacier2_Instrumentation_h__
@@ -29,18 +18,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace Glacier2
diff --git a/cpp/src/Ice/Communicator.cpp b/cpp/src/Ice/Communicator.cpp
index 08f02a87f49..94aef0d1d14 100644
--- a/cpp/src/Ice/Communicator.cpp
+++ b/cpp/src/Ice/Communicator.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Communicator.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -34,18 +23,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/CommunicatorF.cpp b/cpp/src/Ice/CommunicatorF.cpp
index c0a8a7b935a..ff35f810eea 100644
--- a/cpp/src/Ice/CommunicatorF.cpp
+++ b/cpp/src/Ice/CommunicatorF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `CommunicatorF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index c4900ce0595..789659a7dca 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Connection.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/ConnectionF.cpp b/cpp/src/Ice/ConnectionF.cpp
index 2c725314e92..f770be7e196 100644
--- a/cpp/src/Ice/ConnectionF.cpp
+++ b/cpp/src/Ice/ConnectionF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/Current.cpp b/cpp/src/Ice/Current.cpp
index d71af96eb06..4f0764e09c9 100644
--- a/cpp/src/Ice/Current.cpp
+++ b/cpp/src/Ice/Current.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Current.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index c8aed2f1652..76ea747c3eb 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Endpoint.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/EndpointF.cpp b/cpp/src/Ice/EndpointF.cpp
index da489f80353..9482cae41d9 100644
--- a/cpp/src/Ice/EndpointF.cpp
+++ b/cpp/src/Ice/EndpointF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/ImplicitContext.cpp b/cpp/src/Ice/ImplicitContext.cpp
index 15aa80d5248..98057fe0479 100644
--- a/cpp/src/Ice/ImplicitContext.cpp
+++ b/cpp/src/Ice/ImplicitContext.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ImplicitContext.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/ImplicitContextF.cpp b/cpp/src/Ice/ImplicitContextF.cpp
index 11eea36c874..dad1af5e14e 100644
--- a/cpp/src/Ice/ImplicitContextF.cpp
+++ b/cpp/src/Ice/ImplicitContextF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ImplicitContextF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/LocalException.cpp b/cpp/src/Ice/LocalException.cpp
index 5903477f60b..a195fe4af8a 100644
--- a/cpp/src/Ice/LocalException.cpp
+++ b/cpp/src/Ice/LocalException.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `LocalException.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
Ice::InitializationException::~InitializationException()
diff --git a/cpp/src/Ice/Logger.cpp b/cpp/src/Ice/Logger.cpp
index 5e91e409b70..603764c24c1 100644
--- a/cpp/src/Ice/Logger.cpp
+++ b/cpp/src/Ice/Logger.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Logger.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/LoggerF.cpp b/cpp/src/Ice/LoggerF.cpp
index 094ffceb5cc..6a3311e88bf 100644
--- a/cpp/src/Ice/LoggerF.cpp
+++ b/cpp/src/Ice/LoggerF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `LoggerF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/Plugin.cpp b/cpp/src/Ice/Plugin.cpp
index c930b31c904..54de8f87d7f 100644
--- a/cpp/src/Ice/Plugin.cpp
+++ b/cpp/src/Ice/Plugin.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Plugin.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/PluginF.cpp b/cpp/src/Ice/PluginF.cpp
index d7a914a7ac4..aa142d5c48e 100644
--- a/cpp/src/Ice/PluginF.cpp
+++ b/cpp/src/Ice/PluginF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `PluginF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/Properties.cpp b/cpp/src/Ice/Properties.cpp
index 1fc3050a661..506f4283edc 100644
--- a/cpp/src/Ice/Properties.cpp
+++ b/cpp/src/Ice/Properties.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Properties.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -33,18 +22,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/Ice/PropertiesF.cpp b/cpp/src/Ice/PropertiesF.cpp
index 75369c0ce9e..e2daea27d12 100644
--- a/cpp/src/Ice/PropertiesF.cpp
+++ b/cpp/src/Ice/PropertiesF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `PropertiesF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICE_API_EXPORTS
# define ICE_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceBT/ConnectionInfo.cpp b/cpp/src/IceBT/ConnectionInfo.cpp
index c3b648fe152..51700d65d1b 100644
--- a/cpp/src/IceBT/ConnectionInfo.cpp
+++ b/cpp/src/IceBT/ConnectionInfo.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEBT_API_EXPORTS
# define ICEBT_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceBT/EndpointInfo.cpp b/cpp/src/IceBT/EndpointInfo.cpp
index 743bfdd6ba4..3e1b42331c7 100644
--- a/cpp/src/IceBT/EndpointInfo.cpp
+++ b/cpp/src/IceBT/EndpointInfo.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEBT_API_EXPORTS
# define ICEBT_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceBT/Types.cpp b/cpp/src/IceBT/Types.cpp
index 757e72d0120..d3ba3c6fcc6 100644
--- a/cpp/src/IceBT/Types.cpp
+++ b/cpp/src/IceBT/Types.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Types.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEBT_API_EXPORTS
# define ICEBT_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
IceBT::BluetoothException::~BluetoothException()
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index c78120bf688..7dfa1386061 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `IceBox.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEBOX_API_EXPORTS
# define ICEBOX_API_EXPORTS
@@ -34,18 +23,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
IceBox::FailureException::~FailureException()
diff --git a/cpp/src/IceGridLib/PluginFacade.cpp b/cpp/src/IceGridLib/PluginFacade.cpp
index 5e37c289b84..da8f271b95e 100644
--- a/cpp/src/IceGridLib/PluginFacade.cpp
+++ b/cpp/src/IceGridLib/PluginFacade.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `PluginFacade.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEGRID_API_EXPORTS
# define ICEGRID_API_EXPORTS
@@ -35,18 +24,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceIAP/ConnectionInfo.cpp b/cpp/src/IceIAP/ConnectionInfo.cpp
index 94819988fec..406b9ae82e6 100644
--- a/cpp/src/IceIAP/ConnectionInfo.cpp
+++ b/cpp/src/IceIAP/ConnectionInfo.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEIAP_API_EXPORTS
# define ICEIAP_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceIAP/EndpointInfo.cpp b/cpp/src/IceIAP/EndpointInfo.cpp
index 27a6cf1d40c..e70cc5e8fb2 100644
--- a/cpp/src/IceIAP/EndpointInfo.cpp
+++ b/cpp/src/IceIAP/EndpointInfo.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICEIAP_API_EXPORTS
# define ICEIAP_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceSSL/ConnectionInfo.cpp b/cpp/src/IceSSL/ConnectionInfo.cpp
index 971bc2f24f6..fe2ce274358 100644
--- a/cpp/src/IceSSL/ConnectionInfo.cpp
+++ b/cpp/src/IceSSL/ConnectionInfo.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICESSL_API_EXPORTS
# define ICESSL_API_EXPORTS
@@ -30,18 +19,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceSSL/ConnectionInfoF.cpp b/cpp/src/IceSSL/ConnectionInfoF.cpp
index 692d58d7812..61f23665a4a 100644
--- a/cpp/src/IceSSL/ConnectionInfoF.cpp
+++ b/cpp/src/IceSSL/ConnectionInfoF.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `ConnectionInfoF.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICESSL_API_EXPORTS
# define ICESSL_API_EXPORTS
@@ -28,18 +17,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceSSL/EndpointInfo.cpp b/cpp/src/IceSSL/EndpointInfo.cpp
index 9f47398633c..02c1b7385dd 100644
--- a/cpp/src/IceSSL/EndpointInfo.cpp
+++ b/cpp/src/IceSSL/EndpointInfo.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef ICESSL_API_EXPORTS
# define ICESSL_API_EXPORTS
@@ -30,36 +19,14 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
-namespace
-{
-
-}
-
IceSSL::EndpointInfo::~EndpointInfo()
{
}
#else // C++98 mapping
-namespace
-{
-
-}
-
IceSSL::EndpointInfo::~EndpointInfo()
{
}
@@ -68,8 +35,4 @@ IceSSL::EndpointInfo::~EndpointInfo()
ICESSL_API ::Ice::LocalObject* IceSSL::upCast(EndpointInfo* p) { return p; }
/// \endcond
-namespace Ice
-{
-}
-
#endif
diff --git a/cpp/src/IceStorm/Instrumentation.cpp b/cpp/src/IceStorm/Instrumentation.cpp
index e7afd3fd854..ebcead87028 100644
--- a/cpp/src/IceStorm/Instrumentation.cpp
+++ b/cpp/src/IceStorm/Instrumentation.cpp
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Instrumentation.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#include
#include
@@ -31,18 +20,6 @@
# pragma GCC diagnostic ignored "-Wshadow"
#endif
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace
diff --git a/cpp/src/IceStorm/Instrumentation.h b/cpp/src/IceStorm/Instrumentation.h
index fafb67b6528..4702f96e517 100644
--- a/cpp/src/IceStorm/Instrumentation.h
+++ b/cpp/src/IceStorm/Instrumentation.h
@@ -1,17 +1,6 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
-//
-// Ice version 3.7.10
-//
-//
-//
-// Generated from file `Instrumentation.ice'
-//
-// Warning: do not edit this file.
-//
-//
-//
#ifndef __IceStorm_Instrumentation_h__
#define __IceStorm_Instrumentation_h__
@@ -36,18 +25,6 @@
#include
#include
-#ifndef ICE_IGNORE_VERSION
-# if ICE_INT_VERSION / 100 != 307
-# error Ice version mismatch!
-# endif
-# if ICE_INT_VERSION % 100 >= 50
-# error Beta header file detected
-# endif
-# if ICE_INT_VERSION % 100 < 10
-# error Ice patch level mismatch!
-# endif
-#endif
-
#ifdef ICE_CPP11_MAPPING // C++11 mapping
namespace IceStorm
diff --git a/cpp/test/Common/msbuild/packages.config b/cpp/test/Common/msbuild/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Common/msbuild/packages.config
+++ b/cpp/test/Common/msbuild/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj
index 3f976fbee61..b4ca874dbb2 100644
--- a/cpp/test/Common/msbuild/testcommon.vcxproj
+++ b/cpp/test/Common/msbuild/testcommon.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -172,15 +172,15 @@
-
+
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj
index 59bd7d1271d..ca1ba623ee2 100644
--- a/cpp/test/Glacier2/application/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/application/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -254,7 +254,7 @@
-
+
@@ -330,8 +330,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/application/msbuild/client/packages.config b/cpp/test/Glacier2/application/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/application/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/application/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ 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
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/application/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/application/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ 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
index 199db3f6655..a928a8a592f 100644
--- a/cpp/test/Glacier2/application/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/application/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -330,8 +330,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj
index bfab73a4816..dc25f1c3b7c 100644
--- a/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/attack/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -331,8 +331,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/attack/msbuild/client/packages.config b/cpp/test/Glacier2/attack/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/attack/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/attack/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/attack/msbuild/server/packages.config b/cpp/test/Glacier2/attack/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/attack/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/attack/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj
index aa884d8c7ca..dcf215bd77e 100644
--- a/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/attack/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj
index 15621e9df76..b0ea9659d30 100644
--- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -330,8 +330,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj
index 757faad4b41..695066f023f 100644
--- a/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/dynamicFiltering/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -336,8 +336,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj
index 5575868d2a1..aa896245abe 100644
--- a/cpp/test/Glacier2/override/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/override/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -256,7 +256,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/override/msbuild/client/packages.config b/cpp/test/Glacier2/override/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/override/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/override/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/override/msbuild/server/packages.config b/cpp/test/Glacier2/override/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/override/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/override/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj
index 8d4bc573dca..27fa9f138c4 100644
--- a/cpp/test/Glacier2/override/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/override/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj
index 7fc31b1890f..59286efd11b 100644
--- a/cpp/test/Glacier2/router/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/router/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -256,7 +256,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/router/msbuild/client/packages.config b/cpp/test/Glacier2/router/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/router/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/router/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/router/msbuild/server/packages.config b/cpp/test/Glacier2/router/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/router/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/router/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj
index 5e64bda616a..e618822c74c 100644
--- a/cpp/test/Glacier2/router/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/router/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj
index db9de57b06d..93e2828c5e1 100644
--- a/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/sessionControl/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -254,7 +254,7 @@
-
+
@@ -330,8 +330,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/sessionControl/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/sessionControl/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj
index 0daac2ab8fd..c5537a7ca51 100644
--- a/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/sessionControl/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj
index 97ced8eca65..9ef13f1d0bf 100644
--- a/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -254,7 +254,7 @@
-
+
@@ -330,8 +330,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config b/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/sessionHelper/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj
index 54f6cbd1482..1a33d806197 100644
--- a/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/sessionHelper/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -330,8 +330,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj
index f9546f0afba..c2954a15c2d 100644
--- a/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/ssl/msbuild/client/client.vcxproj
@@ -1,6 +1,6 @@
-
+
Cpp11-Debug
@@ -88,7 +88,7 @@
-
+
@@ -160,7 +160,7 @@
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}.
-
-
+
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/ssl/msbuild/client/packages.config b/cpp/test/Glacier2/ssl/msbuild/client/packages.config
index 28e2cf4078a..71004b51d1b 100644
--- a/cpp/test/Glacier2/ssl/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/ssl/msbuild/client/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/ssl/msbuild/server/packages.config b/cpp/test/Glacier2/ssl/msbuild/server/packages.config
index 28e2cf4078a..71004b51d1b 100644
--- a/cpp/test/Glacier2/ssl/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/ssl/msbuild/server/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj
index 13b26f937e3..ac27139ed34 100644
--- a/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/ssl/msbuild/server/server.vcxproj
@@ -1,6 +1,6 @@
-
+
Cpp11-Debug
@@ -82,7 +82,7 @@
-
+
@@ -160,7 +160,7 @@
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}.
-
-
+
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj
index 98b4cb01e08..e4b66cbe7b4 100644
--- a/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj
+++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -255,7 +255,7 @@
-
+
@@ -331,8 +331,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config
+++ b/cpp/test/Glacier2/staticFiltering/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config
+++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj
index 7d6a90d49a4..542c1206736 100644
--- a/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj
+++ b/cpp/test/Glacier2/staticFiltering/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -83,7 +83,7 @@
-
+
@@ -332,8 +332,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/acm/msbuild/client/client.vcxproj b/cpp/test/Ice/acm/msbuild/client/client.vcxproj
index 1c03025bdac..c1746bb6d66 100644
--- a/cpp/test/Ice/acm/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -317,8 +317,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/acm/msbuild/client/packages.config b/cpp/test/Ice/acm/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/acm/msbuild/client/packages.config
+++ b/cpp/test/Ice/acm/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/acm/msbuild/server/packages.config b/cpp/test/Ice/acm/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/acm/msbuild/server/packages.config
+++ b/cpp/test/Ice/acm/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/acm/msbuild/server/server.vcxproj b/cpp/test/Ice/acm/msbuild/server/server.vcxproj
index 79af00f120c..05a1b9101a5 100644
--- a/cpp/test/Ice/acm/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/acm/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj
index 15ba3e0b170..3aee899d497 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -293,8 +293,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj
index 9e1c1b71c3f..cca8c07cd2d 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -337,8 +337,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/collocated/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj
index 98ef54f5af3..295d31039ee 100644
--- a/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/adapterDeactivation/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -336,8 +336,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/admin/msbuild/client/client.vcxproj b/cpp/test/Ice/admin/msbuild/client/client.vcxproj
index 5b9dc9934ff..70b3e096d40 100644
--- a/cpp/test/Ice/admin/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/admin/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/admin/msbuild/client/packages.config b/cpp/test/Ice/admin/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/admin/msbuild/client/packages.config
+++ b/cpp/test/Ice/admin/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/admin/msbuild/server/packages.config b/cpp/test/Ice/admin/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/admin/msbuild/server/packages.config
+++ b/cpp/test/Ice/admin/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/admin/msbuild/server/server.vcxproj b/cpp/test/Ice/admin/msbuild/server/server.vcxproj
index f8f52f3bc67..25b93c259b1 100644
--- a/cpp/test/Ice/admin/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/admin/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/ami/msbuild/client/client.vcxproj b/cpp/test/Ice/ami/msbuild/client/client.vcxproj
index a34a42a67c7..84c4a6c1a50 100644
--- a/cpp/test/Ice/ami/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/ami/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -293,8 +293,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/ami/msbuild/client/packages.config b/cpp/test/Ice/ami/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/ami/msbuild/client/packages.config
+++ b/cpp/test/Ice/ami/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj
index 85f323a2289..de9f85902d5 100644
--- a/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/ami/msbuild/collocated/collocated.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -335,8 +335,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/ami/msbuild/collocated/packages.config b/cpp/test/Ice/ami/msbuild/collocated/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/ami/msbuild/collocated/packages.config
+++ b/cpp/test/Ice/ami/msbuild/collocated/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/ami/msbuild/server/packages.config b/cpp/test/Ice/ami/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/ami/msbuild/server/packages.config
+++ b/cpp/test/Ice/ami/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/ami/msbuild/server/server.vcxproj b/cpp/test/Ice/ami/msbuild/server/server.vcxproj
index d11c855799c..db86b6f6bb8 100644
--- a/cpp/test/Ice/ami/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/ami/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/background/msbuild/client/client.vcxproj b/cpp/test/Ice/background/msbuild/client/client.vcxproj
index caa5eee2df7..795ad5b594a 100644
--- a/cpp/test/Ice/background/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/background/msbuild/client/client.vcxproj
@@ -1,6 +1,6 @@
-
+
Cpp11-Debug
@@ -84,7 +84,7 @@
-
+
@@ -190,7 +190,7 @@
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}.
-
-
+
+
\ No newline at end of file
diff --git a/cpp/test/Ice/background/msbuild/client/packages.config b/cpp/test/Ice/background/msbuild/client/packages.config
index 28e2cf4078a..71004b51d1b 100644
--- a/cpp/test/Ice/background/msbuild/client/packages.config
+++ b/cpp/test/Ice/background/msbuild/client/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/background/msbuild/server/packages.config b/cpp/test/Ice/background/msbuild/server/packages.config
index 28e2cf4078a..71004b51d1b 100644
--- a/cpp/test/Ice/background/msbuild/server/packages.config
+++ b/cpp/test/Ice/background/msbuild/server/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/background/msbuild/server/server.vcxproj b/cpp/test/Ice/background/msbuild/server/server.vcxproj
index 54f13e1169b..1a68b80a31f 100644
--- a/cpp/test/Ice/background/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/background/msbuild/server/server.vcxproj
@@ -1,6 +1,6 @@
-
+
Cpp11-Debug
@@ -84,7 +84,7 @@
-
+
@@ -191,7 +191,7 @@
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}.
-
-
+
+
\ No newline at end of file
diff --git a/cpp/test/Ice/background/msbuild/testtransport/packages.config b/cpp/test/Ice/background/msbuild/testtransport/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/background/msbuild/testtransport/packages.config
+++ b/cpp/test/Ice/background/msbuild/testtransport/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj
index 9e5ee7ed500..13369bfef75 100644
--- a/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj
+++ b/cpp/test/Ice/background/msbuild/testtransport/testtransport.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -353,8 +353,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/binding/msbuild/client/client.vcxproj b/cpp/test/Ice/binding/msbuild/client/client.vcxproj
index 0a296fc1ad8..006c9ae9f3a 100644
--- a/cpp/test/Ice/binding/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/binding/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -293,8 +293,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/binding/msbuild/client/packages.config b/cpp/test/Ice/binding/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/binding/msbuild/client/packages.config
+++ b/cpp/test/Ice/binding/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/binding/msbuild/server/packages.config b/cpp/test/Ice/binding/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/binding/msbuild/server/packages.config
+++ b/cpp/test/Ice/binding/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/binding/msbuild/server/server.vcxproj b/cpp/test/Ice/binding/msbuild/server/server.vcxproj
index 2beee5266b3..79991d565cf 100644
--- a/cpp/test/Ice/binding/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/binding/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/custom/msbuild/client/client.vcxproj b/cpp/test/Ice/custom/msbuild/client/client.vcxproj
index c18913bec37..d0112b22230 100644
--- a/cpp/test/Ice/custom/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/custom/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -498,8 +498,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/custom/msbuild/client/packages.config b/cpp/test/Ice/custom/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/custom/msbuild/client/packages.config
+++ b/cpp/test/Ice/custom/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj
index fb440fc4a76..ee4428a9e5e 100644
--- a/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/custom/msbuild/collocated/collocated.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -502,8 +502,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/custom/msbuild/collocated/packages.config b/cpp/test/Ice/custom/msbuild/collocated/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/custom/msbuild/collocated/packages.config
+++ b/cpp/test/Ice/custom/msbuild/collocated/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/custom/msbuild/server/packages.config b/cpp/test/Ice/custom/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/custom/msbuild/server/packages.config
+++ b/cpp/test/Ice/custom/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/custom/msbuild/server/server.vcxproj b/cpp/test/Ice/custom/msbuild/server/server.vcxproj
index 73a45c159d9..970dddcc5d3 100644
--- a/cpp/test/Ice/custom/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/custom/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -501,8 +501,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/custom/msbuild/serveramd/packages.config b/cpp/test/Ice/custom/msbuild/serveramd/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/custom/msbuild/serveramd/packages.config
+++ b/cpp/test/Ice/custom/msbuild/serveramd/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj
index 6a78aab10bf..c079d3079b8 100644
--- a/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/custom/msbuild/serveramd/serveramd.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -501,8 +501,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj
index e2d7c77b1aa..6f56abc0a23 100644
--- a/cpp/test/Ice/defaultServant/msbuild/client.vcxproj
+++ b/cpp/test/Ice/defaultServant/msbuild/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/defaultServant/msbuild/packages.config b/cpp/test/Ice/defaultServant/msbuild/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/defaultServant/msbuild/packages.config
+++ b/cpp/test/Ice/defaultServant/msbuild/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj
index 922efbf73c2..c401b350792 100644
--- a/cpp/test/Ice/defaultValue/msbuild/client.vcxproj
+++ b/cpp/test/Ice/defaultValue/msbuild/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -333,8 +333,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/defaultValue/msbuild/packages.config b/cpp/test/Ice/defaultValue/msbuild/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/defaultValue/msbuild/packages.config
+++ b/cpp/test/Ice/defaultValue/msbuild/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj
index c9f98dacc12..45cfe88e5c7 100644
--- a/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/dispatcher/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -335,8 +335,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/dispatcher/msbuild/client/packages.config b/cpp/test/Ice/dispatcher/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/dispatcher/msbuild/client/packages.config
+++ b/cpp/test/Ice/dispatcher/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj
index c4d86e80602..9770c262322 100644
--- a/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/dispatcher/msbuild/collocated/collocated.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -337,8 +337,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config b/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config
+++ b/cpp/test/Ice/dispatcher/msbuild/collocated/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/server/packages.config b/cpp/test/Ice/dispatcher/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/dispatcher/msbuild/server/packages.config
+++ b/cpp/test/Ice/dispatcher/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj
index 483147f531e..a350adac02e 100644
--- a/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/dispatcher/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -336,8 +336,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/echo/msbuild/packages.config b/cpp/test/Ice/echo/msbuild/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/echo/msbuild/packages.config
+++ b/cpp/test/Ice/echo/msbuild/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/echo/msbuild/server.vcxproj b/cpp/test/Ice/echo/msbuild/server.vcxproj
index ee74cd92af6..507f84aeb77 100644
--- a/cpp/test/Ice/echo/msbuild/server.vcxproj
+++ b/cpp/test/Ice/echo/msbuild/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/enums/msbuild/client/client.vcxproj b/cpp/test/Ice/enums/msbuild/client/client.vcxproj
index 7a9a7680798..e2e7dd7aa74 100644
--- a/cpp/test/Ice/enums/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/enums/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -333,8 +333,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/enums/msbuild/client/packages.config b/cpp/test/Ice/enums/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/enums/msbuild/client/packages.config
+++ b/cpp/test/Ice/enums/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/enums/msbuild/server/packages.config b/cpp/test/Ice/enums/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/enums/msbuild/server/packages.config
+++ b/cpp/test/Ice/enums/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/enums/msbuild/server/server.vcxproj b/cpp/test/Ice/enums/msbuild/server/server.vcxproj
index 0620bcc5c1e..1ca4794ad01 100644
--- a/cpp/test/Ice/enums/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/enums/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj
index 6efb59915e4..e7d0079869a 100644
--- a/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -294,8 +294,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/exceptions/msbuild/client/packages.config b/cpp/test/Ice/exceptions/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/exceptions/msbuild/client/packages.config
+++ b/cpp/test/Ice/exceptions/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj
index 5dd9d130331..1bf29901009 100644
--- a/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/collocated/collocated.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -336,8 +336,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/exceptions/msbuild/collocated/packages.config
+++ b/cpp/test/Ice/exceptions/msbuild/collocated/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/server/packages.config b/cpp/test/Ice/exceptions/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/exceptions/msbuild/server/packages.config
+++ b/cpp/test/Ice/exceptions/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj
index 074fe4b41d4..c5b99ca2857 100644
--- a/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -335,8 +335,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config
+++ b/cpp/test/Ice/exceptions/msbuild/serveramd/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj
index 51c9f310e42..d442c460517 100644
--- a/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/exceptions/msbuild/serveramd/serveramd.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -343,8 +343,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/facets/msbuild/client/client.vcxproj b/cpp/test/Ice/facets/msbuild/client/client.vcxproj
index 8a1848368a4..a2b3edd0bb7 100644
--- a/cpp/test/Ice/facets/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/facets/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -293,8 +293,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/facets/msbuild/client/packages.config b/cpp/test/Ice/facets/msbuild/client/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/facets/msbuild/client/packages.config
+++ b/cpp/test/Ice/facets/msbuild/client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj
index 51ce3419fc8..ae074589dff 100644
--- a/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/facets/msbuild/collocated/collocated.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -335,8 +335,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/facets/msbuild/collocated/packages.config b/cpp/test/Ice/facets/msbuild/collocated/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/facets/msbuild/collocated/packages.config
+++ b/cpp/test/Ice/facets/msbuild/collocated/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/facets/msbuild/server/packages.config b/cpp/test/Ice/facets/msbuild/server/packages.config
index a93e137eccd..a36cb289a52 100644
--- a/cpp/test/Ice/facets/msbuild/server/packages.config
+++ b/cpp/test/Ice/facets/msbuild/server/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/cpp/test/Ice/facets/msbuild/server/server.vcxproj b/cpp/test/Ice/facets/msbuild/server/server.vcxproj
index d3f6185dbcb..3e7393780c2 100644
--- a/cpp/test/Ice/facets/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/facets/msbuild/server/server.vcxproj
@@ -1,7 +1,7 @@
-
+
Cpp11-Debug
@@ -85,7 +85,7 @@
-
+
@@ -334,8 +334,8 @@
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}.
-
-
+
+
diff --git a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj
index 19ee7899c1b..086711c3285 100644
--- a/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/faultTolerance/msbuild/client/client.vcxproj
@@ -1,7 +1,7 @@
-
+